From 30df3025b641ec757d1f9a4266fb1a0e4d447f94 Mon Sep 17 00:00:00 2001
From: Aadil Ahmed <aadilahmed0@gmail.com>
Date: Thu, 13 Jun 2019 08:43:51 -0700
Subject: [PATCH] Update to Gradle 5 (#2860)

---
 app/build.gradle                         | 1 +
 build.gradle                             | 2 +-
 gradle.properties                        | 3 ++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fac1ab9ba..8a8ccd5e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,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
index ad7e27f69..ac0402861 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ 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"
diff --git a/gradle.properties b/gradle.properties
index fc38b3a14..742f1f5df 100644
--- 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
\ No newline at end of file
+android.enableJetifier=true
+android.enableR8=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 394c95658..8e0247972 100644
--- 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