chore: bump target jdk for Workflows & CI to JDK 21

AniTrend · Jan 5, 2025 · 3bd6774 · 3bd6774
1 parent 47bc9f3
commit 3bd6774
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/android-spotless.yml b/.github/workflows/android-spotless.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v3

diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v3

diff --git a/.github/workflows/gradle-dokka.yml b/.github/workflows/gradle-dokka.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v3

diff --git a/buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/AndroidConfiguration.kt b/buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/AndroidConfiguration.kt
@@ -71,8 +71,8 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
     configureLint()
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     tasks.withType(KotlinCompilationTask::class.java) {
@@ -98,6 +98,6 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
     }
 
     kotlinAndroidProjectExtension().run {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 }
diff --git a/buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/ProjectDokka.kt b/buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/ProjectDokka.kt
@@ -126,7 +126,7 @@ internal fun Project.configureDokka() = tasks.named<DokkaTask>("dokkaHtml") {
             }
 
             // Used for linking to JDK documentation
-            jdkVersion.set(17)
+            jdkVersion.set(21)
 
             // Disable linking to online kotlin-stdlib documentation
             noStdlibLink.set(false)

diff --git a/jitpack.yml b/jitpack.yml
@@ -1,5 +1,5 @@
 jdk:
-  - openjdk17
+  - openjdk21
 #before_install:
 #   - ./custom_setup.sh
 install: