#3816 Update Android Gradle Plugin to 4.0.0 (#3817)

* #3816 Update Android Gradle Plugin to 4.0.0 - upgrade AGP - remove explicit buildToolsVersion

* #3816 Update Android Gradle Plugin to 4.0.0 - remove extraneous multiDexEnabled

* #3816 Update Android Gradle Plugin to 4.0.0 - update Travis to use bundled build tools
This commit is contained in:
Seán Mac Gillicuddy 2020-06-17 17:37:43 +01:00 committed by GitHub
parent c77ed747fe
commit e3213aa5bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions

View file

@ -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

View file

@ -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
}

View file

@ -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"