From 8f73038a66da0a6fd3cf18948ca511cf20e55ea7 Mon Sep 17 00:00:00 2001
From: Sten Tijhuis <102481635+Stensel8@users.noreply.github.com>
Date: Wed, 27 May 2026 11:28:42 +0200
Subject: [PATCH] build: bump JDK 17 to 21

JDK 17 Premier Support ends September 2026. JDK 21 is the current
LTS with Premier Support until 2028.

This change updates the CI workflows, build configuration, and
reproducible-builds Dockerfile to use JDK 21 (Temurin).
---
 .github/workflows/android.yml  | 4 ++--
 .github/workflows/diffuse.yml  | 4 ++--
 gradle/libs.versions.toml      | 4 ++--
 reproducible-builds/Dockerfile | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3a0616cc6fd..cfcdbe0ff07 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -21,12 +21,12 @@ jobs:
       with:
           submodules: true
 
-    - name: set up JDK 17
+    - name: set up JDK 21
       uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
-        java-version: 17
+        java-version: '21'
         cache: gradle
 
     - name: Validate Gradle Wrapper
diff --git a/.github/workflows/diffuse.yml b/.github/workflows/diffuse.yml
index 3e8b05e22af..fb5fad1540c 100644
--- a/.github/workflows/diffuse.yml
+++ b/.github/workflows/diffuse.yml
@@ -22,12 +22,12 @@ jobs:
         submodules: true
         ref: ${{ github.event.pull_request.base.sha }}
 
-    - name: set up JDK 17
+    - name: set up JDK 21
       uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
-        java-version: 17
+        java-version: '21'
         cache: gradle
 
     - name: Install NDK
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 43889688f3e..a8aed68dd2f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,8 +8,8 @@ compileSdk = "android-36"
 targetSdk = "35"
 minSdk = "23"
 ndk = "28.0.13004108"
-javaVersion = "17"
-kotlinJvmTarget = "17"
+javaVersion = "21"
+kotlinJvmTarget = "21"
 gradle = "9.1.1"
 kotlin = "2.2.20"
 android-gradle-plugin = "9.1.1"
diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index 48fb46188f0..99f937f52c1 100644
--- a/reproducible-builds/Dockerfile
+++ b/reproducible-builds/Dockerfile
@@ -12,7 +12,7 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates
 
 # Back to normal, verification back on
 RUN apt update
-RUN apt install -y git openjdk-17-jdk unzip wget
+RUN apt install -y git openjdk-21-jdk unzip wget
 
 ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip
 ENV ANDROID_API_LEVELS                  android-36