From 158c4e96047a6f62085736baf49fa6f4d7a45943 Mon Sep 17 00:00:00 2001 From: Will Molloy Date: Sat, 20 Sep 2025 15:30:48 +1200 Subject: [PATCH 1/6] Gradle 9.1 They updated pretty quick this time! --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48b43d3..a35649f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From c26554f9435f25530115a2f2ff3c19015f6eec7c Mon Sep 17 00:00:00 2001 From: Will Molloy Date: Sat, 20 Sep 2025 15:32:09 +1200 Subject: [PATCH 2/6] Bump to JDK 25 --- .github/actions/setup-java-gradle/action.yml | 2 +- README.md | 2 +- build.gradle.kts | 4 ++-- example-kotlin/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-java-gradle/action.yml b/.github/actions/setup-java-gradle/action.yml index e94de2e..c19a931 100644 --- a/.github/actions/setup-java-gradle/action.yml +++ b/.github/actions/setup-java-gradle/action.yml @@ -5,7 +5,7 @@ runs: uses: actions/setup-java@v5 with: distribution: temurin - java-version: 21 + java-version: 25 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/README.md b/README.md index 26d57a4..f6583aa 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ template repo for Java (or Kotlin/Scala) Gradle projects ## Features -- JDK 21 +- JDK 25 - [Gradle 9](https://github.com/gradle/gradle) (Kotlin DSL) - [GitHub Actions](https://github.com/features/actions) CI/CD - Automatic code formatting via [Spotless](https://github.com/diffplug/spotless) diff --git a/build.gradle.kts b/build.gradle.kts index 250e2ab..28f1d4c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,8 +24,8 @@ allprojects { apply(plugin = "java") configure { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } apply(plugin = "com.diffplug.spotless") diff --git a/example-kotlin/build.gradle.kts b/example-kotlin/build.gradle.kts index 6b2cc84..b6351bf 100644 --- a/example-kotlin/build.gradle.kts +++ b/example-kotlin/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } kotlin { - jvmToolchain(21) + jvmToolchain(25) } // TODO disabling on Kotlin/Scala atm... too many false positives From 73d7a59c6ce623a3c13eb5254308a96f87a35830 Mon Sep 17 00:00:00 2001 From: Will Molloy Date: Sat, 20 Sep 2025 15:36:00 +1200 Subject: [PATCH 3/6] Bump kotlin too --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a46634..2226b35 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ truth = "1.4.4" mockito = "5.19.0" # langs scala = "3.7.1" -kotlin = "2.2.10" +kotlin = "2.2.20" # plugins spotless = "7.2.1" checkstyle = "10.12.0" From cf957cabbb9500fdd8f36a49bc3d9b83d364c3ac Mon Sep 17 00:00:00 2001 From: Will Molloy Date: Sat, 20 Sep 2025 15:37:15 +1200 Subject: [PATCH 4/6] Revert "Bump kotlin too" This reverts commit 73d7a59c6ce623a3c13eb5254308a96f87a35830. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2226b35..8a46634 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ truth = "1.4.4" mockito = "5.19.0" # langs scala = "3.7.1" -kotlin = "2.2.20" +kotlin = "2.2.10" # plugins spotless = "7.2.1" checkstyle = "10.12.0" From c0e600dbe376ede79db1af843ae4937a44f09c8a Mon Sep 17 00:00:00 2001 From: Will Molloy Date: Thu, 25 Sep 2025 19:26:15 +1200 Subject: [PATCH 5/6] Bump spotless --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a46634..e4b0326 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ mockito = "5.19.0" scala = "3.7.1" kotlin = "2.2.10" # plugins -spotless = "7.2.1" +spotless = "8.0.0" checkstyle = "10.12.0" spotbugs-plugin = "6.2.5" buildtimetracker = "5.0.1" From 22f922c220f7999c37cdb17a5b89203b57c32fb0 Mon Sep 17 00:00:00 2001 From: Will Molloy Date: Mon, 22 Dec 2025 15:22:35 +1100 Subject: [PATCH 6/6] Bump to Kotlin 2.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e4b0326..5f3ecb3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ truth = "1.4.4" mockito = "5.19.0" # langs scala = "3.7.1" -kotlin = "2.2.10" +kotlin = "2.3.0" # plugins spotless = "8.0.0" checkstyle = "10.12.0"