From 71df82b1c0bd310e8edbbf2ab4b40ed1e8238b8f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 23 Jun 2025 14:57:45 -0700 Subject: [PATCH] Bump Kotlin to version 2.2.0 --- .github/workflows/bld.yml | 2 +- .idea/misc.xml | 2 +- examples/.idea/kotlinc.xml | 9 ++++++++- examples/lib/bld/bld-wrapper.properties | 2 +- examples/src/bld/java/com/example/ExampleBuild.java | 8 ++++---- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index bacdbae..8d626ff 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: java-version: [ 17, 21, 24 ] - kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ] + kotlin-version: [ 1.9.25, 2.0.21, 2.2.0 ] os: [ ubuntu-latest, windows-latest, macos-latest ] runs-on: ${{ matrix.os }} diff --git a/.idea/misc.xml b/.idea/misc.xml index cf8a3be..0010291 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/examples/.idea/kotlinc.xml b/examples/.idea/kotlinc.xml index 0dd4b35..9156431 100644 --- a/examples/.idea/kotlinc.xml +++ b/examples/.idea/kotlinc.xml @@ -1,6 +1,13 @@ + + - + + \ No newline at end of file diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 67eaf60..5f14be0 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.10-SNAPSHOT -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0-SNAPSHOT +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.1 diff --git a/examples/src/bld/java/com/example/ExampleBuild.java b/examples/src/bld/java/com/example/ExampleBuild.java index ac58c5e..341e205 100644 --- a/examples/src/bld/java/com/example/ExampleBuild.java +++ b/examples/src/bld/java/com/example/ExampleBuild.java @@ -26,12 +26,12 @@ public class ExampleBuild extends Project { javaRelease = 17; - downloadSources = true; autoDownloadPurge = true; + downloadSources = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); - final var kotlin = version(2, 1, 20); + final var kotlin = version(2, 2, 0); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)); scope(test) @@ -102,9 +102,9 @@ public class ExampleBuild extends Project { .execute(); } - @BuildCommand(value = "test-ci", summary = "Run detek with a test baseline") + @BuildCommand(value = "test-ci", summary = "Run detekt with a test baseline") public void testCi() throws ExitStatusException, IOException, InterruptedException { - // Run detek with the test basline (for CI testing) + // Run detekt with the test baseline (for CI testing) new DetektOperation() .fromProject(this) .baseline("src/test/resources/detekt-baseline.xml")