Upgrade to Java 22

jonatan-ivanov · Mar 28, 2024 · c469cb9 · c469cb9
1 parent 2e5e900
commit c469cb9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'liberica'
         java-version: |
-          17
+          22
           21
     - name: Validate Gradle wrapper
       uses: gradle/wrapper-validation-action@v1

diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ apply from: 'gradle/docker.gradle'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(22)
     }
 }
 

diff --git a/gradle/runtime.gradle b/gradle/runtime.gradle
@@ -39,8 +39,8 @@ ext.debugJvmArgs = [
 
 version = grgit ? "${grgit.head().abbreviatedId}.${Instant.now().epochSecond}" : (System.env.SOURCE_VERSION ?: '0.0.0-UNKNOWN')
 
-bootRun {
-    jvmArgs += commonJvmArgs + jmxJvmArgs + debugJvmArgs
-}
+bootRun.jvmArgs += commonJvmArgs + jmxJvmArgs + debugJvmArgs
+// TODO: remove this once the Boot Gradle Plugin works with Java 22
+springBoot.mainClass = 'resourceater.ResourceaterApplication'
 
 mkdir 'logs' // The JVM is not able to start if the GC logs folder does not exists :(
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ apply from: 'gradle/docker.gradle' @@
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(22)
         }
     }
@@ Expand Down @@