diff --git a/.gitea/workflows/build_arch.yml b/.gitea/workflows/build_arch.yml index e8287ed..9d3ed48 100644 --- a/.gitea/workflows/build_arch.yml +++ b/.gitea/workflows/build_arch.yml @@ -31,9 +31,12 @@ jobs: run: | ./setup.sh - - name: Build APKs + - name: Build APKs debug run: | ./build.sh + + - name: Build APKs release + run: | ./build.sh clean - name: Copy APKs to host directory diff --git a/build.sh b/build.sh index 66af876..34e406b 100755 --- a/build.sh +++ b/build.sh @@ -4,11 +4,18 @@ # Check for a build mode argument -export JAVA_HOME="/usr/lib/jvm/java-21-openjdk" +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="clean build" BUILD_LOGGING="" diff --git a/src/FastAdmin/app/build.gradle b/src/FastAdmin/app/build.gradle index 1a87fa7..5f4f6af 100644 --- a/src/FastAdmin/app/build.gradle +++ b/src/FastAdmin/app/build.gradle @@ -5,20 +5,20 @@ plugins { android { namespace 'com.example.FastAdmin' // Replace with your package name - compileSdk 34 // Use the latest stable SDK + 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'