From 74b15ce766096ce491eade389130b1b06d5bd272 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 6 May 2026 18:59:19 +0200
Subject: [PATCH] Java fixes

Use 25 in build.sh (Fedora 44 doesn't ship with 21 anymore) and target
21 consistently (Android Studio doesn't support 25 yet)
---
 .github/workflows/android.yml |  6 +++---
 app/build.gradle.kts          |  6 +++---
 build.sh                      | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d06f688b0..4e4998709 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -24,7 +24,7 @@ permissions:
   security-events: none
   statuses: none
 env:
-  JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
+  JAVA_HOME: /usr/lib/jvm/java-25-openjdk-amd64
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -34,10 +34,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: gradle/actions/wrapper-validation@v5
-      - name: set up OpenJDK 21
+      - name: set up OpenJDK 25
         run: |
           sudo apt-get update
-          sudo apt-get install -y openjdk-21-jdk-headless
+          sudo apt-get install -y openjdk-25-jdk-headless
           sudo update-alternatives --auto java
       - name: Build
         run: ./gradlew assemble${{ matrix.flavor }}Release
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 39f0c9781..a3ef4b401 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -98,7 +98,7 @@ android {
 
     kotlin {
         compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
+            jvmTarget = JvmTarget.JVM_21
         }
     }
     compileOptions {
@@ -107,8 +107,8 @@ android {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
diff --git a/build.sh b/build.sh
index 972e38d99..fab324cff 100755
--- a/build.sh
+++ b/build.sh
@@ -11,13 +11,13 @@ if [ -z "${ANDROID_HOME:-}" ]; then
 fi
 
 if [ -z "${JAVA_HOME:-}" ]; then
-  echo "JAVA_HOME is not set, setting to Java 21"
+  echo "JAVA_HOME is not set, setting to Java 25"
   if [ -f "/etc/debian_version" ]; then
-    echo "Debian-based distro, Java 21 is /usr/lib/jvm/java-21-openjdk-amd64"
-    export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+    echo "Debian-based distro, Java 25 is /usr/lib/jvm/java-25-openjdk-amd64"
+    export JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
   else
-    echo "Not Debian-based, assuming Fedora and setting Java 21 as /usr/lib/jvm/java-21-openjdk"
-    export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
+    echo "Not Debian-based, assuming Fedora and setting Java 25 as /usr/lib/jvm/java-25-openjdk"
+    export JAVA_HOME=/usr/lib/jvm/java-25-openjdk
   fi
 fi