From b0888238361168838693b40a6b77f4ed9de83129 Mon Sep 17 00:00:00 2001
From: anorien90 <h.lorenzen@nxs.solutions>
Date: Wed, 10 Dec 2025 11:05:14 +0100
Subject: [PATCH] updated java version

---
 build.sh       | 1 +
 dist/.baserc   | 2 +-
 dist/pacman.sh | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 1afcb7f..f8e7acd 100755
--- a/build.sh
+++ b/build.sh
@@ -29,6 +29,7 @@ yes | /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses
 for dir in src/*/; do
     if [ -f "$dir/build.gradle" ]; then
         echo "Building project in $dir"
+        gradle --stop
         (cd "$dir" && gradle clean $BUILD_MODE $BUILD_LOGGING)
     else
         echo "No build.gradle found in $dir, skipping."
diff --git a/dist/.baserc b/dist/.baserc
index fb47a14..feddca6 100644
--- a/dist/.baserc
+++ b/dist/.baserc
@@ -1,4 +1,4 @@
-export JAVA_HOME="/usr/lib/jvm/java-25-openjdk"
+export JAVA_HOME="/usr/lib/jvm/java-21-openjdk"
 export ANDROID_HOME='/opt/android-sdk'
 export PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin"
 export PATH="${PATH}:${ANDROID_HOME}/platform-tools"
diff --git a/dist/pacman.sh b/dist/pacman.sh
index ecc1271..8b119b8 100755
--- a/dist/pacman.sh
+++ b/dist/pacman.sh
@@ -12,9 +12,6 @@ else
     pacman -Syu --noconfirm "${packages[@]}"
 fi
 
-# Set arch-specific packages like Java version
-archlinux-java set java-25-openjdk # Use the version you installed
-
 ARCH_PACKAGE_FILE="dist/arch/packages.txt"
 
 if [ ! -f "$ARCH_PACKAGE_FILE" ]; then