From 1787c0e74ee777b2946a6cede141cc62b0f38e8f Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sat, 28 Nov 2020 10:06:53 -0600 Subject: [PATCH] Upgrade to Android Gradle plugin 4.1.0 --- android/android-base/build.gradle | 4 ++-- android/gradle.properties | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/android-base/build.gradle b/android/android-base/build.gradle index f10169233..ba3cc6c54 100644 --- a/android/android-base/build.gradle +++ b/android/android-base/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion MIN_SDK_VERSION as Integer targetSdkVersion TARGET_SDK_VERSION as Integer - versionCode VERSION_CODE as Integer - versionName "$VERSION_NAME" + buildConfigField 'int', 'VERSION_CODE', "$VERSION_CODE" + buildConfigField 'String', 'VERSION_NAME', "\"$VERSION_NAME\"" } compileOptions { diff --git a/android/gradle.properties b/android/gradle.properties index 163b6096f..31aec0569 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -10,7 +10,7 @@ KOTLIN_VERSION = 1.4.0 KX_COROUTINES_VERSION = 1.4.2 SUPPORT_LIBRARY_VERSION = 28.0.0 AUTO_FACTORY_VERSION = 1.0-beta6 -BUILD_TOOLS_VERSION = 4.0.0 +BUILD_TOOLS_VERSION = 4.1.0 KTOR_VERSION=1.4.2 org.gradle.parallel=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 84337ad35..2aa714b7c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Nov 28 09:55:24 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip