Gradle 5 update (commons-app#3023)

* Update to Gradle 5 * Update gradle-play-publisher
ajuancer · Jun 17, 2019 · 8e35787 · 8e35787
1 parent f2a499e
commit 8e35787
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'com.github.triplet.play' version '2.2.1' apply false
+}
+
 apply from: '../gitutils.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -28,6 +32,7 @@ dependencies {
     implementation 'com.facebook.fresco:fresco:1.13.0'
     implementation 'com.drewnoakes:metadata-extractor:2.11.0'
     implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.18'
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
 
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'

diff --git a/build.gradle b/build.gradle
@@ -6,12 +6,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-
-        classpath "com.github.triplet.gradle:play-publisher:2.0.0-rc1"
         classpath 'org.codehaus.groovy:groovy-all:2.4.15'
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -25,4 +25,5 @@ DAGGER_VERSION=2.21
 systemProp.http.proxyPort=0
 systemProp.http.proxyHost=
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.enableR8=false
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-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip