From 4f776d384515e1786378c4e62780977b4dec7fd9 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Tue, 21 Apr 2020 11:39:26 -0400 Subject: [PATCH] Update a few plugins, clean up androidx list --- build.gradle | 6 ++---- twidere/build.gradle | 18 ++++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 694f2c967..4ce1ff666 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,7 @@ allprojects { projectVersionName = '4.0.9' globalCompileSdkVersion = 29 - globalBuildToolsVersion = '29.0.2' - + globalBuildToolsVersion = "29.0.3" globalMinSdkVersion = 19 globalTargetSdkVersion = 29 @@ -39,14 +38,13 @@ allprojects { subprojects { buildscript { ext { - kotlinVersion = '1.3.61' + kotlinVersion = '1.3.72' pluginVersions = [ AndroidSvgDrawable: '3.0.0', PlayServices : '4.3.3', ] libVersions = [ Kotlin : "${kotlinVersion}", - SupportLib : '26.1.0', SupportTest : '1.0.0', MariotakuCommons : '0.9.20', RestFu : '0.9.60', diff --git a/twidere/build.gradle b/twidere/build.gradle index e2a4ac486..03d00dfcd 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -161,21 +161,18 @@ dependencies { /** Android support **/ - implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.core:core:1.2.0' - implementation 'androidx.legacy:legacy-support-core-utils:1.0.0' - implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' - implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.palette:palette:1.0.0' - implementation 'androidx.legacy:legacy-preference-v14:1.0.0' implementation 'androidx.browser:browser:1.2.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.core:core:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01' - implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.exifinterface:exifinterface:1.1.0' + implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.google.android.material:material:1.1.0' /** Third-party dependencies **/ @@ -274,6 +271,7 @@ dependencies { // Stetho dependency, see https://g.co/androidstudio/app-test-app-conflict debugImplementation 'com.google.code.findbugs:jsr305:3.0.2' + /** Testing **/ testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.annotation:annotation:1.1.0'