From 0a30bf6d8e999f502f70f47367cf839831599e64 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <contact@imranr.dev>
Date: Sat, 31 May 2025 03:57:16 -0400
Subject: [PATCH] Update to Java 21 + hardcode NDK to avoid warnings

---
 .github/workflows/release.yml | 2 +-
 android/app/build.gradle.kts  | 2 +-
 docker/Dockerfile             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22362c2..a4386c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
 
       - name: Flutter Doctor
         id: flutter_doctor
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index b144dc3..985d2ad 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -29,7 +29,7 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace = "dev.imranr.obtainium"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "27.0.12077973" // 'flutter.ndkVersion' produces warnings (TODO can/should we switch back?)
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f3ea808..b92aa42 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,7 +51,7 @@ RUN \
     mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
     rm -v /tmp/tools.zip && \
     mkdir -p /root/.android/ && touch /root/.android/repositories.cfg &&\
-    apt-get install -y --no-install-recommends openjdk-17-jdk openjdk-17-jre &&\
+    apt-get install -y --no-install-recommends openjdk-21-jdk openjdk-21-jre &&\
     yes | sdkmanager --licenses &&\
     sdkmanager --update