From 1ee4c590b737fe5e3ccfb753cafc876feb1a96d8 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 1 Jul 2026 10:11:52 -0400
Subject: [PATCH] Bump java and kotlin target to JDK 21.

---
 .github/workflows/android.yml  | 4 ++--
 .github/workflows/diffuse.yml  | 4 ++--
 .tool-versions                 | 2 +-
 gradle/libs.versions.toml      | 4 ++--
 reproducible-builds/Dockerfile | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index be3ad45d9f..b78bb019b5 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -22,12 +22,12 @@ jobs:
           submodules: true
           lfs: true
 
-    - name: set up JDK 17
+    - name: set up JDK 21
       uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
 
     - name: Validate Gradle Wrapper
       uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
diff --git a/.github/workflows/diffuse.yml b/.github/workflows/diffuse.yml
index 790f744245..97a3b0794f 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@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
 
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
diff --git a/.tool-versions b/.tool-versions
index 2463d4ab00..4e8b348598 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-java openjdk-17.0.2
+java openjdk-21.0.2
 uv   latest
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fb88c9e952..87a423a5ff 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,8 +8,8 @@ compileSdk = "android-36.1"
 targetSdk = "35"
 minSdk = "23"
 ndk = "28.0.13004108"
-javaVersion = "17"
-kotlinJvmTarget = "17"
+javaVersion = "21"
+kotlinJvmTarget = "21"
 gradle = "9.2.1"
 kotlin = "2.2.20"
 android-gradle-plugin = "9.2.1"
diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index a01736711d..b6d7ccddae 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-headless unzip wget
 
 ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME=commandlinetools-linux-10406996_latest.zip
 ENV ANDROID_COMMAND_LINE_TOOLS_SHA256=8919e8752979db73d8321e9babe2caedcc393750817c1a5f56c128ec442fb540
@@ -31,7 +31,7 @@ RUN unzip ${ANDROID_COMMAND_LINE_TOOLS_FILENAME} -d /usr/local/android-sdk-linux
 RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}
 
 RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
-RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services" "ndk;28.0.13004108" "cmake;3.22.1"
+RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platform-tools" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services" "ndk;28.0.13004108" "cmake;3.22.1"
 
 RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"