Bump gradle stuff (#268)

slinkydeveloper · web-flow · commit 6eb81f3657d7 · 2025-04-10T15:34:44.000+02:00
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -68,7 +68,7 @@ jobs:
         if: github.event.inputs.sdkJavaVersion != ''
         with:
           distribution: "temurin"
-          java-version: "17"
+          java-version: "21"
       - name: Setup Gradle
         if: github.event.inputs.sdkJavaVersion != ''
         uses: gradle/actions/setup-gradle@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jvm-version: [ 17 ]
+        jvm-version: [ 21 ]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/java/basics/build.gradle.kts b/java/basics/build.gradle.kts
@@ -1,5 +1,3 @@
-import java.net.URI
-
 plugins {
   java
   application
@@ -27,6 +25,12 @@ dependencies {
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1")
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
+
 // Set main class
 application {
   if (project.hasProperty("mainClass")) {
diff --git a/java/basics/gradle/wrapper/gradle-wrapper.properties b/java/basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/java/integrations/java-spring/build.gradle.kts b/java/integrations/java-spring/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
 	java
-    application
+	application
 	id("org.springframework.boot") version "3.3.1"
 	id("io.spring.dependency-management") version "1.1.5"
 	id("com.diffplug.spotless") version "6.25.0"
@@ -35,7 +35,7 @@ dependencies {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
+		languageVersion = JavaLanguageVersion.of(21)
 	}
 }
 
diff --git a/java/integrations/java-spring/gradle/wrapper/gradle-wrapper.properties b/java/integrations/java-spring/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/java/patterns-use-cases/build.gradle.kts b/java/patterns-use-cases/build.gradle.kts
@@ -30,6 +30,12 @@ dependencies {
   implementation("org.apache.logging.log4j:log4j-api:2.24.1")
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
+
 // Set main class
 application {
   if (project.hasProperty("mainClass")) {
@@ -47,10 +53,4 @@ tasks.withType<JavaCompile> {
 
 tasks.named<Test>("test") {
   useJUnitPlatform()
-}
-
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-  }
 }
diff --git a/java/patterns-use-cases/gradle/wrapper/gradle-wrapper.properties b/java/patterns-use-cases/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/java/templates/java-gradle/build.gradle.kts b/java/templates/java-gradle/build.gradle.kts
@@ -23,6 +23,12 @@ dependencies {
   testImplementation("dev.restate:sdk-testing:$restateVersion")
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
+
 // Set main class
 application {
   mainClass.set("my.example.Greeter")
@@ -31,9 +37,3 @@ application {
 tasks.named<Test>("test") {
   useJUnitPlatform()
 }
-
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-  }
-}
diff --git a/java/templates/java-gradle/gradle/wrapper/gradle-wrapper.properties b/java/templates/java-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/java/templates/java-maven/pom.xml b/java/templates/java-maven/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <restate.version>2.0.0</restate.version>
   </properties>
 
diff --git a/java/tutorials/tour-of-restate-java/build.gradle.kts b/java/tutorials/tour-of-restate-java/build.gradle.kts
@@ -22,6 +22,12 @@ dependencies {
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1")
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
+
 // Set main class
 application {
   if (project.hasProperty("mainClass")) {
diff --git a/java/tutorials/tour-of-restate-java/gradle/wrapper/gradle-wrapper.properties b/java/tutorials/tour-of-restate-java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kotlin/basics/.gitignore b/kotlin/basics/.gitignore
@@ -31,5 +31,7 @@ build
 .idea
 *.iml
 
+.kotlin
+
 # Unignore the gradle wrapper
 !gradle/wrapper/gradle-wrapper.jar
diff --git a/kotlin/basics/build.gradle.kts b/kotlin/basics/build.gradle.kts
@@ -1,9 +1,7 @@
 plugins {
   application
   kotlin("jvm") version "2.0.0"
-  // Kotlinx serialization (optional)
   kotlin("plugin.serialization") version "2.0.0"
-
   id("com.google.devtools.ksp") version "2.0.0-1.0.21"
 }
 
@@ -22,11 +20,8 @@ dependencies {
   implementation("org.apache.logging.log4j:log4j-api:2.24.1")
 }
 
-// Setup Java/Kotlin compiler target
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-  }
+kotlin {
+  jvmToolchain(21)
 }
 
 // Set main class
diff --git a/kotlin/basics/gradle/wrapper/gradle-wrapper.jar b/kotlin/basics/gradle/wrapper/gradle-wrapper.jar
diff --git a/kotlin/basics/gradle/wrapper/gradle-wrapper.properties b/kotlin/basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kotlin/basics/gradlew b/kotlin/basics/gradlew
diff --git a/kotlin/basics/gradlew.bat b/kotlin/basics/gradlew.bat
diff --git a/kotlin/integrations/kotlin-gradle-lambda-cdk/.gitignore b/kotlin/integrations/kotlin-gradle-lambda-cdk/.gitignore
@@ -7,4 +7,5 @@ lambda/build
 *.js
 *.d.ts
 *.class
-cdk.context.json
+cdk.context.json
+.kotlin
diff --git a/kotlin/integrations/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts b/kotlin/integrations/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts
@@ -1,5 +1,3 @@
-import java.net.URI
-
 plugins {
   kotlin("jvm") version "2.0.0"
   // Kotlinx serialization (optional)
diff --git a/kotlin/integrations/kotlin-gradle-lambda-cdk/lambda/gradle/wrapper/gradle-wrapper.properties b/kotlin/integrations/kotlin-gradle-lambda-cdk/lambda/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kotlin/patterns-use-cases/build.gradle.kts b/kotlin/patterns-use-cases/build.gradle.kts
@@ -1,9 +1,7 @@
 plugins {
   application
   kotlin("jvm") version "2.0.0"
-  // Kotlinx serialization (optional)
   kotlin("plugin.serialization") version "2.0.0"
-
   id("com.google.devtools.ksp") version "2.0.0-1.0.21"
 }
 
@@ -27,11 +25,8 @@ dependencies {
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
 }
 
-// Setup Java/Kotlin compiler target
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-  }
+kotlin {
+  jvmToolchain(21)
 }
 
 // Configure main class
diff --git a/kotlin/templates/kotlin-gradle/.gitignore b/kotlin/templates/kotlin-gradle/.gitignore
@@ -28,6 +28,7 @@ hs_err_pid*
 # Ignore Gradle build output directory
 build
 
+.kotlin
 .idea
 *.iml
 
diff --git a/kotlin/templates/kotlin-gradle/build.gradle.kts b/kotlin/templates/kotlin-gradle/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 }
 
 kotlin {
-  jvmToolchain(17)
+  jvmToolchain(21)
 }
 
 // Configure main class
diff --git a/kotlin/templates/kotlin-gradle/gradle/wrapper/gradle-wrapper.properties b/kotlin/templates/kotlin-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`java`
`3`		`- application`
	`3`	`+ application`
`4`	`4`	`id("org.springframework.boot") version "3.3.1"`
`5`	`5`	`id("io.spring.dependency-management") version "1.1.5"`
`6`	`6`	`id("com.diffplug.spotless") version "6.25.0"`
`@@ -35,7 +35,7 @@ dependencies {`
`35`	`35`
`36`	`36`	`java {`
`37`	`37`	`toolchain {`
`38`		`- languageVersion = JavaLanguageVersion.of(17)`
	`38`	`+ languageVersion = JavaLanguageVersion.of(21)`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`