From 53441148b87ccf165126e4f1a87ceff4159c1d88 Mon Sep 17 00:00:00 2001 From: Dmitriy Karpushin Date: Tue, 17 Jan 2023 16:12:42 +0300 Subject: [PATCH] Revert of Gradle upgrade --- client/android/build.gradle | 6 +++--- client/android/gradle/wrapper/gradle-wrapper.properties | 2 +- deploy/build_android.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/android/build.gradle b/client/android/build.gradle index 49ef8758c..69eda3e58 100644 --- a/client/android/build.gradle +++ b/client/android/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.github.ben-manes.versions' buildscript { ext{ - kotlin_version = "1.6.20" + kotlin_version = "1.4.30-M1" // for libwg appcompatVersion = '1.1.0' annotationsVersion = '1.0.1' @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.2.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 = 31 + targetSdkVersion = 30 versionCode 10 // Change to a higher number versionName "2.0.10" // Change to a higher number diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties index 92f06b50f..669386b87 100644 --- a/client/android/gradle/wrapper/gradle-wrapper.properties +++ b/client/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/deploy/build_android.sh b/deploy/build_android.sh index d9d8f5c77..befa88f48 100644 --- a/deploy/build_android.sh +++ b/deploy/build_android.sh @@ -51,7 +51,7 @@ $QT_HOST_PATH/bin/androiddeployqt \ --gradle \ --release \ --input android-AmneziaVPN-deployment-settings.json \ - --android-platform android-33 + --android-platform android-30 echo "............Copy apk.................." cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \