Bump jdkVersion to 21

SanmerApps · May 7, 2024 · a96666d · a96666d
1 parent 24c2f55
commit a96666d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -30,11 +30,11 @@ jobs:
  echo ${{ secrets.KEY_STORE }} | base64 --decode > ${{ github.workspace }}/key.jks
  fi
 
- - name: Set up JDK 17
+ - name: Set up JDK
  uses: actions/setup-java@v4
  with:
  distribution: 'zulu'
- java-version: 17
+ java-version: 21
 
  - name: Set up Gradle
  uses: gradle/actions/setup-gradle@v3

diff --git a/build-logic/src/main/kotlin/ApplicationConventionPlugin.kt b/build-logic/src/main/kotlin/ApplicationConventionPlugin.kt
@@ -26,19 +26,19 @@ class ApplicationConventionPlugin : Plugin<Project> {
  }
 
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
  }
  }
 
  extensions.configure<JavaPluginExtension> {
  toolchain {
- languageVersion.set(JavaLanguageVersion.of(17))
+ languageVersion.set(JavaLanguageVersion.of(21))
  }
  }
 
  extensions.configure<KotlinAndroidProjectExtension> {
- jvmToolchain(17)
+ jvmToolchain(21)
 
  sourceSets.all {
  languageSettings {

diff --git a/build-logic/src/main/kotlin/LibraryConventionPlugin.kt b/build-logic/src/main/kotlin/LibraryConventionPlugin.kt
@@ -24,19 +24,19 @@ class LibraryConventionPlugin : Plugin<Project> {
  }
 
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
  }
  }
 
  extensions.configure<JavaPluginExtension> {
  toolchain {
- languageVersion.set(JavaLanguageVersion.of(17))
+ languageVersion.set(JavaLanguageVersion.of(21))
  }
  }
 
  extensions.configure<KotlinAndroidProjectExtension> {
- jvmToolchain(17)
+ jvmToolchain(21)
  }
  }
  }