From 95bf2f03adb301be03c458317354316ff00ae657 Mon Sep 17 00:00:00 2001 From: Bohdan Shulyar Date: Thu, 17 Jul 2025 11:30:49 +0300 Subject: [PATCH] android: bump deps --- scripts/gha/build_android.sh | 4 ++-- scripts/gha/deps_android.sh | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/gha/build_android.sh b/scripts/gha/build_android.sh index 1fd8ed22..09ac1321 100755 --- a/scripts/gha/build_android.sh +++ b/scripts/gha/build_android.sh @@ -1,7 +1,7 @@ #!/bin/bash unset ANDROID_SDK_ROOT -export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.7+7 +export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.15+6 export ANDROID_HOME=$GITHUB_WORKSPACE/sdk export PATH=$PATH:$JAVA_HOME/bin:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/tools/bin @@ -11,7 +11,7 @@ pushd android pushd app/build/outputs/apk/continuous -$ANDROID_HOME/build-tools/34.0.0/apksigner sign \ +$ANDROID_HOME/build-tools/36.0.0/apksigner sign \ --ks $GITHUB_WORKSPACE/android/debug.keystore \ --ks-key-alias androiddebugkey \ --ks-pass pass:android \ diff --git a/scripts/gha/deps_android.sh b/scripts/gha/deps_android.sh index 1436e19d..abda2ba5 100755 --- a/scripts/gha/deps_android.sh +++ b/scripts/gha/deps_android.sh @@ -2,13 +2,14 @@ cd $GITHUB_WORKSPACE -ANDROID_COMMANDLINE_TOOLS_VER="11076708" -ANDROID_BUILD_TOOLS_VER="34.0.0" -ANDROID_PLATFORM_VER="android-34" +ANDROID_COMMANDLINE_TOOLS_VER="13114758" +ANDROID_BUILD_TOOLS_VER="36.0.0" +ANDROID_PLATFORM_VER="android-35" +ANDROID_NDK_VERSION="28.2.13676358" echo "Download JDK 17" -wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz -qO- | tar -xzf - || exit 1 -export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.7+7 +wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_linux_hotspot_17.0.15_6.tar.gz -qO- | tar -xzf - || exit 1 +export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.15+6 export PATH=$PATH:$JAVA_HOME/bin echo "Download hlsdk-portable" @@ -35,4 +36,4 @@ popd echo "Download all needed tools and Android NDK" yes | sdkmanager --licenses > /dev/null 2>/dev/null # who even reads licenses? :) -sdkmanager --install build-tools\;${ANDROID_BUILD_TOOLS_VER} platform-tools platforms\;${ANDROID_PLATFORM_VER} +sdkmanager --install build-tools\;${ANDROID_BUILD_TOOLS_VER} platform-tools platforms\;${ANDROID_PLATFORM_VER} ndk\;${ANDROID_NDK_VERSION}