Fix of GitHub Actions build

This commit is contained in:
Dmitriy Karpushin 2023-01-17 15:32:06 +03:00
parent c3f423aad5
commit c3c87bff74
4 changed files with 13 additions and 5 deletions

View file

@ -296,6 +296,7 @@ jobs:
export ANDROID_NDK_PLATFORM=android-23
export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
export ANDROID_CURRENT_ARCH=${{ matrix.arch }}
if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then
wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&

View file

@ -2,7 +2,7 @@ apply plugin: 'com.github.ben-manes.versions'
buildscript {
ext{
kotlin_version = "1.4.30-M1"
kotlin_version = "1.6.20"
// for libwg
appcompatVersion = '1.1.0'
annotationsVersion = '1.0.1'
@ -20,7 +20,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@ -121,7 +121,7 @@ android {
defaultConfig {
resConfig "en"
minSdkVersion = 24
targetSdkVersion = 30
targetSdkVersion = 31
versionCode 10 // Change to a higher number
versionName "2.0.10" // Change to a higher number

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View file

@ -20,6 +20,12 @@ APP_DOMAIN=org.amneziavpn.package
OUT_APP_DIR=$BUILD_DIR/client
BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
# Seacrh Qt
if [ -z "${QT_VERSION+x}" ]; then
QT_VERSION=6.4.1;
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/$ANDROID_CURRENT_ARCH/bin
fi
echo "Using Qt in $QT_BIN_DIR"
echo "Using Android SDK in $ANDROID_SDK_ROOT"
echo "Using Android NDK in $ANDROID_NDK_ROOT"
@ -44,7 +50,8 @@ $QT_HOST_PATH/bin/androiddeployqt \
--output $OUT_APP_DIR/android-build \
--gradle \
--release \
--input android-AmneziaVPN-deployment-settings.json
--input android-AmneziaVPN-deployment-settings.json \
--android-platform android-33
echo "............Copy apk.................."
cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \