fix #546: Updated AGP to 4.1.1, Gradle 6.5 and fixed stuff broken by …

…Google
gotev · Dec 11, 2020 · 2f179c3 · 2f179c3
1 parent ff518f0
commit 2f179c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/examples/app/gradle/wrapper/gradle-wrapper.properties b/examples/app/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-bin.zip
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-bin.zip
diff --git a/manifest.gradle b/manifest.gradle
@@ -19,8 +19,8 @@ ext {
     demo_app_id = 'net.gotev.uploadservicedemo'
 
     // Gradle classpath dependencies versions
-    kotlin_version = '1.4.0'
-    gradle_version = '4.0.0'
+    kotlin_version = '1.4.10'
+    gradle_version = '4.1.1'
     gradle_versions_plugin_version = '0.28.0'
     bintray_plugin_version = '1.8.4'
     kotlin_lint_version = '9.0.0'

diff --git a/uploadservice/build.gradle b/uploadservice/build.gradle
@@ -39,6 +39,12 @@ android {
         targetSdkVersion target_sdk
         versionCode version_code
         versionName library_version
+
+        // https://commonsware.com/blog/2020/10/14/android-studio-4p1-library-modules-version-code.html
+        // https://issuetracker.google.com/issues/158695880#comment15
+        buildConfigField 'int', 'VERSION_CODE', "$version_code"
+        buildConfigField 'String', 'VERSION_NAME', "\"$library_version\""
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }