chore: upgrade JDK to 21 (#166)

svenjacobs · Sep 26, 2024 · 3b65129 · 3b65129
1 parent 2ed8003
commit 3b65129
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Deploy release
         env:

diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Check app
         run: ./gradlew check
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

diff --git a/android-tests/build.gradle.kts b/android-tests/build.gradle.kts
@@ -7,6 +7,12 @@ val androidMinSdk: Int by rootProject.extra
 val androidTargetSdk: Int by rootProject.extra
 val androidCompileSdk: Int by rootProject.extra
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
+
 android {
 	namespace = "com.svenjacobs.reveal.android.tests"
 	compileSdk = androidCompileSdk

diff --git a/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts b/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 
 val baseName: String by extra
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
+
 kotlin {
 	applyDefaultHierarchyTemplate()
 

diff --git a/reveal-compat-android/build.gradle.kts b/reveal-compat-android/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 	id("convention.publication")
 }
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
+
 val publicationName by extra { "Reveal (Compat Android)" }
 
 val androidMinSdk: Int by rootProject.extra