RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

android: bump deps

Browse Source
This commit is contained in:
Bohdan Shulyar
2025-07-17 11:30:49 +03:00
committed by a1batross
parent ca6de641a1
commit 95bf2f03ad
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/gha/build_android.sh
View File

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

13
scripts/gha/deps_android.sh
View File

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