mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
* #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
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -15,7 +15,7 @@ android:
components: components:
- tools - tools
- platform-tools - platform-tools
- build-tools-28.0.3 - build-tools-29.0.2
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository
- android-22 - android-22

2
app/build.gradle
View file

@ -134,7 +134,6 @@ dependencies {
android { android {
compileSdkVersion 28 compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig { defaultConfig {
//applicationId 'fr.free.nrw.commons' //applicationId 'fr.free.nrw.commons'
@ -152,7 +151,6 @@ android {
testOptions { testOptions {
execution 'ANDROIDX_TEST_ORCHESTRATOR' execution 'ANDROIDX_TEST_ORCHESTRATOR'
} }
multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
} }

2
build.gradle
View file

@ -7,7 +7,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" } maven { url "https://plugins.gradle.org/m2/" }
} }
dependencies { 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.hiya:jacoco-android:0.2"
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"