⬆️ chore: upgrade JDK 17 → 21 across build, CI, and Docker

vitofico · vitofico · commit b286d812752e · 2026-05-08T16:20:01.000+02:00
F-Droid's buildserver runs JDK 21; matching it removes the JVM-target
mismatch that was breaking the build (compileJava 17 vs compileKotlin
21). All modules now pin source/target/jvmTarget to 21. AGP 8.5 + Kotlin
2.0 + desugar_jdk_libs 2.1.2 all support JDK 21.

Local Docker image: 'docker rmi quire-build:latest' before next
'scripts/dgradle' run to pick up the new base image.
diff --git a/.github/workflows/android-ci.yaml b/.github/workflows/android-ci.yaml
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
       - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3
         with:
           packages: "platform-tools platforms;android-34 build-tools;34.0.0"
@@ -107,7 +107,7 @@ jobs:
       - uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
       - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3
         with:
           packages: "platform-tools platforms;android-34 build-tools;34.0.0"
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
       - if: matrix.language == 'java-kotlin'
         uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3
         with:
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 eclipse-temurin:17-jdk-jammy
+FROM --platform=linux/amd64 eclipse-temurin:21-jdk-jammy
 
 ARG ANDROID_CMDLINE_TOOLS_VERSION=11076708
 ARG ANDROID_PLATFORM=android-34
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -37,11 +37,11 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "21" }
     buildFeatures { compose = true }
     testOptions { unitTests.isIncludeAndroidResources = true }
     signingConfigs {
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -10,10 +10,10 @@ android {
         minSdk = 26
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "21" }
     testOptions { unitTests.isIncludeAndroidResources = true }
 }
 
diff --git a/core/identity/build.gradle.kts b/core/identity/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {
diff --git a/data/local/build.gradle.kts b/data/local/build.gradle.kts
@@ -13,10 +13,10 @@ android {
         ksp { arg("room.schemaLocation", "$projectDir/schemas") }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "21" }
     testOptions { unitTests.isIncludeAndroidResources = true }
     sourceSets {
         getByName("test") {
diff --git a/data/opds/build.gradle.kts b/data/opds/build.gradle.kts
@@ -12,11 +12,11 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "21" }
     testOptions { unitTests.isIncludeAndroidResources = true }
 }
 
diff --git a/data/sync/build.gradle.kts b/data/sync/build.gradle.kts
@@ -12,10 +12,10 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "21" }
     testOptions { unitTests.isIncludeAndroidResources = true }
 }
 
diff --git a/reader/build.gradle.kts b/reader/build.gradle.kts
@@ -11,11 +11,11 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "21" }
     buildFeatures { compose = false }
     testOptions { unitTests.isIncludeAndroidResources = true }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=linux/amd64 eclipse-temurin:17-jdk-jammy`
	`1`	`+FROM --platform=linux/amd64 eclipse-temurin:21-jdk-jammy`
`2`	`2`
`3`	`3`	`ARG ANDROID_CMDLINE_TOOLS_VERSION=11076708`
`4`	`4`	`ARG ANDROID_PLATFORM=android-34`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ android {`
`10`	`10`	`minSdk = 26`
`11`	`11`	`}`
`12`	`12`	`compileOptions {`
`13`		`- sourceCompatibility = JavaVersion.VERSION_17`
`14`		`- targetCompatibility = JavaVersion.VERSION_17`
	`13`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`14`	`+ targetCompatibility = JavaVersion.VERSION_21`
`15`	`15`	`}`
`16`		`- kotlinOptions { jvmTarget = "17" }`
	`16`	`+ kotlinOptions { jvmTarget = "21" }`
`17`	`17`	`testOptions { unitTests.isIncludeAndroidResources = true }`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`java {`
`7`		`- sourceCompatibility = JavaVersion.VERSION_17`
`8`		`- targetCompatibility = JavaVersion.VERSION_17`
	`7`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`8`	`+ targetCompatibility = JavaVersion.VERSION_21`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`java {`
`6`		`- sourceCompatibility = JavaVersion.VERSION_17`
`7`		`- targetCompatibility = JavaVersion.VERSION_17`
	`6`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`7`	`+ targetCompatibility = JavaVersion.VERSION_21`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ android {`
`13`	`13`	`ksp { arg("room.schemaLocation", "$projectDir/schemas") }`
`14`	`14`	`}`
`15`	`15`	`compileOptions {`
`16`		`- sourceCompatibility = JavaVersion.VERSION_17`
`17`		`- targetCompatibility = JavaVersion.VERSION_17`
	`16`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`17`	`+ targetCompatibility = JavaVersion.VERSION_21`
`18`	`18`	`}`
`19`		`- kotlinOptions { jvmTarget = "17" }`
	`19`	`+ kotlinOptions { jvmTarget = "21" }`
`20`	`20`	`testOptions { unitTests.isIncludeAndroidResources = true }`
`21`	`21`	`sourceSets {`
`22`	`22`	`getByName("test") {`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ android {`
`12`	`12`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`13`	`13`	`}`
`14`	`14`	`compileOptions {`
`15`		`- sourceCompatibility = JavaVersion.VERSION_17`
`16`		`- targetCompatibility = JavaVersion.VERSION_17`
	`15`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`16`	`+ targetCompatibility = JavaVersion.VERSION_21`
`17`	`17`	`isCoreLibraryDesugaringEnabled = true`
`18`	`18`	`}`
`19`		`- kotlinOptions { jvmTarget = "17" }`
	`19`	`+ kotlinOptions { jvmTarget = "21" }`
`20`	`20`	`testOptions { unitTests.isIncludeAndroidResources = true }`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ android {`
`12`	`12`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`13`	`13`	`}`
`14`	`14`	`compileOptions {`
`15`		`- sourceCompatibility = JavaVersion.VERSION_17`
`16`		`- targetCompatibility = JavaVersion.VERSION_17`
	`15`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`16`	`+ targetCompatibility = JavaVersion.VERSION_21`
`17`	`17`	`}`
`18`		`- kotlinOptions { jvmTarget = "17" }`
	`18`	`+ kotlinOptions { jvmTarget = "21" }`
`19`	`19`	`testOptions { unitTests.isIncludeAndroidResources = true }`
`20`	`20`	`}`
`21`	`21`