Fix all the JVM toolchain stuff

restatedev · Sep 4, 2024 · f199be3 · f199be3
1 parent 37ece2c
commit f199be3
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jvm-version: [17]
+        jvm-version: [ 11 ]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/basics/basics-kotlin/build.gradle.kts b/basics/basics-kotlin/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 // Setup Java/Kotlin compiler target
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(11))
   }
 }
 

diff --git a/basics/basics-kotlin/settings.gradle.kts b/basics/basics-kotlin/settings.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
diff --git a/end-to-end-applications/java/food-ordering/app/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/build.gradle.kts
@@ -12,7 +12,7 @@ allprojects {
 
   java {
     // Configure the java toolchain to use. If not found, it will be downloaded automatically
-    toolchain { languageVersion = JavaLanguageVersion.of(17) }
+    toolchain { languageVersion = JavaLanguageVersion.of(11) }
   }
 }
 

diff --git a/end-to-end-applications/java/food-ordering/app/settings.gradle.kts b/end-to-end-applications/java/food-ordering/app/settings.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
+
 rootProject.name = "food-ordering-app"
 include("restaurant", "restate-app")
 

diff --git a/end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
+
 rootProject.name = "food-ordering-app"
 include("restaurant", "restate-app")
 

diff --git a/patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts b/patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
diff --git a/patterns-use-cases/integrations/java-spring/settings.gradle.kts b/patterns-use-cases/integrations/java-spring/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
+
 rootProject.name = "java-spring"
diff --git a/patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts b/patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
diff --git a/patterns-use-cases/sagas/sagas-java/settings.gradle.kts b/patterns-use-cases/sagas/sagas-java/settings.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
diff --git a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts
@@ -31,6 +31,6 @@ dependencies {
 // Setup Java/Kotlin compiler target
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(11))
   }
 }
diff --git a/patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
diff --git a/templates/java-maven/pom.xml b/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>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <restate.version>1.0.1</restate.version>
   </properties>
 

diff --git a/templates/kotlin-gradle/build.gradle.kts b/templates/kotlin-gradle/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 // Setup Java/Kotlin compiler target
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(11))
   }
 }
 

diff --git a/templates/kotlin-gradle/settings.gradle.kts b/templates/kotlin-gradle/settings.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}