From 8b7cbda892da806693d649fc7f8e51ebd583587f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 21:37:49 -0700 Subject: [PATCH 1/2] Updated extensions Bump Detekt to version 0.9.10-SNAPSHOT Bump Dokka to version 1.0.4-SNAPSHOT Bump Kotlin to version 1.1.0-SNAPSHOT --- lib/bld/bld-wrapper.properties | 6 +++--- src/bld/java/com/example/ExampleBuild.java | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 1ccd3a2..936a923 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -4,9 +4,9 @@ bld.downloadLocation= bld.extensions= bld.javaOptions= bld.javacOptions= -bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.9 -bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.3 -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4 +bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.10-SNAPSHOT +bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.4-SNAPSHOT +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0-SNAPSHOT bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS bld.sourceDirectories= bld.version=2.2.1 diff --git a/src/bld/java/com/example/ExampleBuild.java b/src/bld/java/com/example/ExampleBuild.java index 85b7a49..79ef18f 100644 --- a/src/bld/java/com/example/ExampleBuild.java +++ b/src/bld/java/com/example/ExampleBuild.java @@ -61,14 +61,12 @@ public class ExampleBuild extends Project { @BuildCommand(summary = "Compiles the Kotlin project") @Override public void compile() throws Exception { - // Avoid warnings in JDK 24 - final var options = new CompileOptions().jvmOptions("--enable-native-access=ALL-UNNAMED"); // The source code located in src/main/kotlin and src/test/kotlin will be compiled new CompileKotlinOperation() .fromProject(this) - .compileOptions(options) // .kotlinHome("path/to/kotlin") // .kotlinc("path/to/kotlinc") + .compileOptions(new CompileOptions().verbose(true)) .execute(); } From 9ea651d0c601526551585738b478fe1452392fcb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 21:37:56 -0700 Subject: [PATCH 2/2] Add Windows and macOS testing --- .github/workflows/bld.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index bdd3185..1fcc6f8 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -2,17 +2,15 @@ name: bld-ci on: [push, pull_request, workflow_dispatch] -env: - KOTLIN_HOME: /usr/share/kotlinc - jobs: build-gradle-project: - runs-on: ubuntu-latest - strategy: matrix: java-version: [17, 21, 24] kotlin-version: [1.9.25, 2.1.20] + os: [ ubuntu-latest, windows-latest, macos-latest ] + + runs-on: ${{ matrix.os }} steps: - name: Checkout source repository