commons-app#3816 Update Android Gradle Plugin to 4.0.0 (commons-app#3817)

macgills · web-flow · commit e3213aa5bd8f · 2020-06-17T09:37:43.000-07:00
* commons-app#3816 Update Android Gradle Plugin to 4.0.0 - upgrade AGP - remove explicit buildToolsVersion * commons-app#3816 Update Android Gradle Plugin to 4.0.0 - remove extraneous multiDexEnabled * commons-app#3816 Update Android Gradle Plugin to 4.0.0 - update Travis to use bundled build tools
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-28.0.3
+  - build-tools-29.0.2
   - extra-google-m2repository
   - extra-android-m2repository
   - android-22
diff --git a/app/build.gradle b/app/build.gradle
@@ -134,7 +134,6 @@ dependencies {
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "28.0.3"
 
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
@@ -152,7 +151,6 @@ android {
         testOptions {
             execution 'ANDROIDX_TEST_ORCHESTRATOR'
         }
-        multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
 
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "com.hiya:jacoco-android:0.2"
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,6 @@ dependencies {`
`134`	`134`
`135`	`135`	`android {`
`136`	`136`	`compileSdkVersion 28`
`137`		`- buildToolsVersion "28.0.3"`
`138`	`137`
`139`	`138`	`defaultConfig {`
`140`	`139`	`//applicationId 'fr.free.nrw.commons'`
`@@ -152,7 +151,6 @@ android {`
`152`	`151`	`testOptions {`
`153`	`152`	`execution 'ANDROIDX_TEST_ORCHESTRATOR'`
`154`	`153`	`}`
`155`		`- multiDexEnabled true`
`156`	`154`	`vectorDrawables.useSupportLibrary = true`
`157`	`155`	`}`
`158`	`156`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`maven { url "https://plugins.gradle.org/m2/" }`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.6.3'`
	`10`	`+ classpath 'com.android.tools.build:gradle:4.0.0'`
`11`	`11`	`classpath "com.hiya:jacoco-android:0.2"`
`12`	`12`	`classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"`