Merge pull request #5 from QuasarApp/JDK17
Some checks failed
buildbot/DocsGenerator Build finished.
buildbot/WindowsCMakeBuilder Build finished.
buildbot/IOSCMakeBuilder Build finished.
buildbot/AndroidBuilder_v8Qt6 Build finished.
buildbot/LinuxCMakeBuilderQt6 Build finished.

JDK 17
This commit is contained in:
Andrei Yankovich 2023-09-07 15:34:31 +03:00 committed by GitHub
commit f04966fc03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -10,7 +10,7 @@ fi
OLD_SDK_ROOT=$HOME/AndroidSDK
SDK_ROOT=$EXTERNAL_HOME/AndroidSDK
export JAVA_HOME="$SNAP/usr/lib/jvm/java-11-openjdk-amd64"
export JAVA_HOME="$SNAP/usr/lib/jvm/java-17-openjdk-amd64"
export ANDROID_SDK_HOME="$HOME/.Android"
export _JAVA_OPTIONS=-Duser.home=$HOME

View File

@ -1,5 +1,5 @@
name: androidsdk
version: '1.2.0.1'
version: '1.2.1.1'
summary: The package contains android sdkmanager.
description: |
This is snap version of console sdk manager for Android. For more information about sdkmanager see official google documentation git@github.com:EndrII/sdkmanager-android.git.
@ -18,19 +18,19 @@ parts:
stage-packages:
- libfreetype6
- libpng16-16
- openjdk-11-jdk
- openjdk-11-jre
- openjdk-11-jre-headless
- openjdk-17-jdk
- openjdk-17-jre
- openjdk-17-jre-headless
build-packages:
- ca-certificates
- ca-certificates-java
- openjdk-11-jre-headless
- openjdk-17-jre-headless
override-stage: |
snapcraftctl stage
chmod 777 -R "$SNAPCRAFT_STAGE/cmdline-tools"
override-prime: |
snapcraftctl prime
rm -vf usr/lib/jvm/java-11-openjdk-*/lib/security/blacklisted.certs
rm -vf usr/lib/jvm/java-17-openjdk-*/lib/security/blacklisted.certs
after:
- androidsdk-wraper