mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-09 16:43:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3116 from CatimaLoyalty/feature/java_25_21

Browse Source 
Java fixes
This commit is contained in:
Sylvia van Os
2026-05-06 20:29:56 +02:00
committed by GitHub
parent cea4a5431e 74b15ce766
commit 4bf6ae897f
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/android.yml vendored
View File

@@ -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

6
app/build.gradle.kts
View File

@@ -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
}
}

10
build.sh
View File

@@ -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