updated java version

.gitea/workflows/build_arch.yml

@@ -31,9 +31,15 @@ jobs:
         run: |
           ./setup.sh
 
-      - name: Build APKs
+      - name: Build APKs debug
         run: |
           ./build.sh
+
+      - name: Build APKs release
+        run: |
+          find . -name "build" -type d -exec rm -rf {} +
+          rm -rf ~/.gradle/caches/
+          rm -rf /workspace/Fast/apk/src/**/app/build/kotlin
           ./build.sh clean
 
       - name: Copy APKs to host directory

build.sh

@@ -4,8 +4,20 @@
 
 # Check for a build mode argument
 
+echo "Find Java and Android SDK paths"
+
+echo "JAVA_HOME before: $JAVA_HOME"
+echo "Finding javac path... $(which javac)"
+
+
+export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
+export ANDROID_HOME='/opt/android-sdk'
+export PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin"
+export PATH="${PATH}:${ANDROID_HOME}/platform-tools"
+
+
 if [ "$1" == "clean" ]; then
-    BUILD_MODE="assembleClean"
+    BUILD_MODE="clean assembleRelease"
     BUILD_LOGGING=""
 else
     BUILD_MODE="assembleDebug"
@@ -29,6 +41,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."

dist/pacman.sh

@@ -12,9 +12,6 @@ else
     pacman -Syu --noconfirm "${packages[@]}"
 fi
 
-# Set arch-specific packages like Java version
-archlinux-java set java-21-openjdk # Use the version you installed
-
 ARCH_PACKAGE_FILE="dist/arch/packages.txt"
 
 if [ ! -f "$ARCH_PACKAGE_FILE" ]; then

src/FastAdmin/app/build.gradle

@@ -1,24 +1,24 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    id = 'com.android.application'
+    id = 'org.jetbrains.kotlin.android'
 }
 
 android {
-    namespace 'com.example.FastAdmin' // Replace with your package name
-    compileSdk 34 // Use the latest stable SDK
+    namespace = 'com.example.FastAdmin' // Replace with your package name
+    compileSdk = 34 // Use the latest stable SDK
 
     defaultConfig {
-        applicationId "com.example.FastAdmin"
-        minSdk 24
-        targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        applicationId = "com.example.FastAdmin"
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.:with0"
     }
     
     // Optional: for Kotlin usage
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
@@ -27,6 +27,6 @@ android {
 
 dependencies {
     // Add necessary dependencies
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation = 'androidx.core:core-ktx:1.9.0'
+    implementation = 'androidx.appcompat:appcompat:1.6.1'
 }

src/FastAdmin/local.properties

@@ -1 +0,0 @@
-sdk.dir=/opt/android-sdk

src/FastDocumentation/local.properties

@@ -1 +0,0 @@
-sdk.dir=/opt/android-sdk