Upgrade JDK 18 -> 21

dzirbel · Apr 14, 2024 · 25b23a1 · 25b23a1
1 parent c30fb92
commit 25b23a1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '18'
+          java-version: '21'
 
       - run: ./gradlew --stacktrace --continue check
 

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '18'
+          java-version: '21'
 
       - name: Download B2 binary
         run: curl https://github.com/Backblaze/B2_Command_Line_Tool/releases/download/v2.1.0/b2-linux -L -o b2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '18'
+          java-version: '21'
 
       - run: ./gradlew --stacktrace packageReleaseDistributionForCurrentOS packageReleaseUberJarForCurrentOS
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -141,8 +141,14 @@ fun Project.configureTests() {
             exceptionFormat = TestExceptionFormat.FULL
         }
 
-        // allowing mocking of java.time in JDK 16+ per https://mockk.io/doc/md/jdk16-access-exceptions.html
-        jvmArgs = listOf("--add-opens", "java.base/java.time=ALL-UNNAMED")
+        jvmArgs = listOf(
+            // allowing mocking of java.time in JDK 16+ per https://mockk.io/doc/md/jdk16-access-exceptions.html
+            "--add-opens",
+            "java.base/java.time=ALL-UNNAMED",
+
+            // avoid warning for mockk dynamic agent loading in Java 21+: https://github.com/mockito/mockito/issues/3037
+            "-XX:+EnableDynamicAgentLoading",
+        )
 
         // hacky, but causes gradle builds to fail if tests write or std_err (which often indicates exceptions handled
         // by the Thread.uncaughtExceptionHandler)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ detekt = "1.23.6" # https://github.com/detekt/detekt
 exposed = "0.49.0" # https://github.com/JetBrains/Exposed
 jacoco = "0.8.12" # https://github.com/jacoco/jacoco
 junit5 = "5.10.2" # https://junit.org/junit5/
-jvm = "18" # https://www.java.com/releases/; also update versions in CI workflows
+jvm = "21" # https://www.java.com/releases/; also update versions in CI workflows
 kotlin = "1.9.23" # https://kotlinlang.org/releases.html
 kotlinx-coroutines = "1.8.0" # https://github.com/Kotlin/kotlinx.coroutines
 kotlinx-serialization = "1.6.3" # https://github.com/Kotlin/kotlinx.serialization