From ef3e1338d88700d4f91db8af2ca68d791649ac06 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Thu, 7 Sep 2023 12:55:31 +0300 Subject: [PATCH 1/3] Update snapcraft.yaml Signed-off-by: Andrei Yankovich --- snap/snapcraft.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a54d74a..0c6cf4e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -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,13 +18,13 @@ 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" From e39e634a1ef47216e6397db51b7de5b50ce7b72a Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Thu, 7 Sep 2023 12:56:22 +0300 Subject: [PATCH 2/3] Update start.sh Signed-off-by: Andrei Yankovich --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index e0edb91..015007a 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -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 From aa84d053a30af329facc3e6bf3a4f1b43fce0b41 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Thu, 7 Sep 2023 15:33:26 +0300 Subject: [PATCH 3/3] Update snapcraft.yaml Signed-off-by: Andrei Yankovich --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0c6cf4e..e8eb735 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -30,7 +30,7 @@ parts: 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