QuasarApp/sdkmanager-android
4
0
Fork 0
mirror of https://github.com/QuasarApp/sdkmanager-android.git synced 2025-05-01 15:09:33 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/start.sh
View File

@ -10,7 +10,7 @@ fi
OLD_SDK_ROOT=$HOME/AndroidSDK OLD_SDK_ROOT=$HOME/AndroidSDK
SDK_ROOT=$EXTERNAL_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 ANDROID_SDK_HOME="$HOME/.Android"
export _JAVA_OPTIONS=-Duser.home=$HOME export _JAVA_OPTIONS=-Duser.home=$HOME

12
snap/snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: androidsdk name: androidsdk
version: '1.2.0.1' version: '1.2.1.1'
summary: The package contains android sdkmanager. summary: The package contains android sdkmanager.
description: | 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. 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: stage-packages:
- libfreetype6 - libfreetype6
- libpng16-16 - libpng16-16
- openjdk-11-jdk - openjdk-17-jdk
- openjdk-11-jre - openjdk-17-jre
- openjdk-11-jre-headless - openjdk-17-jre-headless
build-packages: build-packages:
- ca-certificates - ca-certificates
- ca-certificates-java - ca-certificates-java
- openjdk-11-jre-headless - openjdk-17-jre-headless
override-stage: | override-stage: |
snapcraftctl stage snapcraftctl stage
chmod 777 -R "$SNAPCRAFT_STAGE/cmdline-tools" chmod 777 -R "$SNAPCRAFT_STAGE/cmdline-tools"
override-prime: | override-prime: |
snapcraftctl 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: after:
- androidsdk-wraper - androidsdk-wraper