From cdde39ea64224b2f80378b219519066812dcf4e2 Mon Sep 17 00:00:00 2001 From: Yongce Tu Date: Wed, 7 Oct 2020 21:34:39 +0800 Subject: [PATCH] Upgrade library versions --- android_project_common.gradle | 41 ++++++++++++++-------------- archLintRulesTestDemo/build.gradle | 43 +++++++++++++++++++++++++----- build.gradle | 2 +- 3 files changed, 59 insertions(+), 27 deletions(-) diff --git a/android_project_common.gradle b/android_project_common.gradle index 27f0006..93d938c 100644 --- a/android_project_common.gradle +++ b/android_project_common.gradle @@ -38,33 +38,33 @@ ext { 'compileSdk' : 30, // Android official support - 'kotlin' : '1.4.0', - 'kotlinCoroutine' : "1.3.7", + 'kotlin' : '1.4.10', + 'kotlinCoroutine' : "1.3.9", 'multidexLib' : "2.0.1", - 'androidxCore' : '1.3.1', + 'androidxCore' : '1.3.2', 'fragment' : '1.2.5', - 'preference' : "1.1.0", + 'preference' : "1.1.1", 'palette' : "1.0.0", 'recyclerView' : "1.1.0", - 'constraintLayout' : "2.0.0", + 'constraintLayout' : "2.0.2", 'vectorDrawable' : "1.1.0", 'lintLib' : '27.0.0', 'archCore' : "2.1.0", 'lifecycle' : "2.2.0", 'room' : '2.2.5', 'sqlite' : "2.1.0", - 'navigation' : "2.2.1", - 'paging' : "2.1.1", - 'work' : "2.3.3", + 'navigation' : "2.3.0", + 'paging' : "2.1.2", + 'work' : "2.4.0", 'media2' : "1.0.3", // test - 'testCore' : "1.2.0", - 'espresso' : "3.2.0", + 'testCore' : "1.3.0", + 'espresso' : "3.3.0", 'uiautomator' : "2.2.0", 'truth' : '1.0.1', 'hamcrest' : '2.2', - 'mockito' : "2.25.0", + 'mockito' : "3.5.11", 'powermock' : '1.6.6', 'robolectric' : '4.3.1', 'mockk' : "1.10.0", @@ -79,7 +79,7 @@ ext { 'guava' : "29.0-android", // debug - 'leakcanary' : "1.6.3", + 'leakcanary' : "2.4", 'stetho' : '1.5.1', 'ktlint' : "0.36.0", @@ -123,7 +123,7 @@ ext { 'collectionKtx' : "androidx.collection:collection-ktx:1.1.0", // UI 'appcompat' : "androidx.appcompat:appcompat:1.2.0", - 'material' : "com.google.android.material:material:1.2.0", + 'material' : "com.google.android.material:material:1.2.1", 'preference' : "androidx.preference:preference:${versions.preference}", 'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}", 'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}", @@ -135,20 +135,20 @@ ext { 'recyclerviewSelection' : "androidx.recyclerview:recyclerview:${versions.recyclerView}", 'percent' : "androidx.percentlayout:percentlayout:1.0.0", 'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.1.0", - 'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.0.0", - 'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0", + 'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.1.1", + 'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0", 'viewPager' : "androidx.viewpager:viewpager:1.0.0", 'viewPager2' : "androidx.viewpager2:viewpager2:1.0.0", 'vectorDrawable' : "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}", 'animatedVectorDrawable' : "androidx.vectordrawable:vectordrawable-animated:${versions.vectorDrawable}", - 'browser' : "androidx.browser:browser:1.0.0", + 'browser' : "androidx.browser:browser:1.2.0", 'transition' : "androidx.transition:transition:1.3.1", // others 'multidex' : "androidx.multidex:multidex:${versions.multidexLib}", 'mediaSession' : "androidx.media2:media2-session:${versions.media2}", 'mediaExoPlayer' : "androidx.media2:media2-exoplayer:${versions.media2}", 'mediarouter' : "androidx.mediarouter:mediarouter:1.1.0", - 'exifinterface' : "androidx.exifinterface:exifinterface:1.0.0", + 'exifinterface' : "androidx.exifinterface:exifinterface:1.3.0", 'wear' : "androidx.wear:wear:1.0.0", // legacy 'coreUtils' : "androidx.legacy:legacy-support-core-utils:1.0.0", @@ -220,9 +220,9 @@ ext { 'monitor' : "androidx.test:monitor:${versions.testCore}", 'orchestrator' : "androidx.test:orchestrator:${versions.testCore}", // ext - 'junit' : "androidx.test.ext:junit:1.1.1", - 'junitKtx' : "androidx.test.ext:junit-ktx:1.1.1", - 'truthAndroidX' : 'androidx.test.ext:truth:1.2.0', + 'junit' : "androidx.test.ext:junit:1.1.2", + 'junitKtx' : "androidx.test.ext:junit-ktx:1.1.2", + 'truthAndroidX' : "androidx.test.ext:truth:1.3.0", 'truth' : "com.google.truth:truth:${versions.truth}", 'truthJava8' : "com.google.truth.extensions:truth-java8-extension:${versions.truth}", // espresso @@ -277,6 +277,7 @@ ext { // UI 'flexbox' : "com.google.android:flexbox:2.0.1", + 'lottie' : "com.airbnb.android:lottie:3.4.4", // rx 'rx': [ diff --git a/archLintRulesTestDemo/build.gradle b/archLintRulesTestDemo/build.gradle index 08233f1..509e1aa 100644 --- a/archLintRulesTestDemo/build.gradle +++ b/archLintRulesTestDemo/build.gradle @@ -37,16 +37,42 @@ android { dependencies { implementation project(':archLib') - implementation deps.kotlin.stdlib - implementation deps.androidx.appcompat + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" + implementation "androidx.appcompat:appcompat:1.2.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlinCoroutine}" // The following dependencies are just for checking new versions of library + implementation "androidx.core:core:${versions.androidxCore}" + implementation "androidx.fragment:fragment:${versions.fragment}" + implementation "com.google.android.material:material:1.2.1" implementation "androidx.multidex:multidex:${versions.multidexLib}" implementation "androidx.annotation:annotation:1.1.0" + implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0" + implementation "androidx.collection:collection:1.1.0" + implementation "androidx.preference:preference:${versions.preference}" implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}" + implementation "androidx.cardview:cardview:1.0.0" + implementation "androidx.gridlayout:gridlayout:1.0.0" + implementation "androidx.palette:palette:${versions.palette}" + implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}" + implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0" + implementation "androidx.drawerlayout:drawerlayout:1.1.1" + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" + implementation "androidx.viewpager2:viewpager2:1.0.0" + implementation "androidx.navigation:navigation-runtime:${versions.navigation}" + implementation "androidx.paging:paging-runtime:${versions.paging}" + implementation "androidx.work:work-runtime:${versions.work}" + implementation "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}" + implementation "androidx.browser:browser:1.2.0" + implementation "androidx.transition:transition:1.3.1" + implementation "androidx.media2:media2-session:${versions.media2}" + implementation "androidx.mediarouter:mediarouter:1.1.0" + implementation "androidx.exifinterface:exifinterface:1.3.0" + implementation "androidx.arch.core:core-common:${versions.archCore}" - implementation "androidx.lifecycle:lifecycle-common:${versions.lifecycle}" - implementation "androidx.room:room-common:${versions.room}" + implementation "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}" + implementation "androidx.room:room-runtime:${versions.room}" + implementation "androidx.sqlite:sqlite:${versions.sqlite}" implementation ("com.google.android.gms:play-services-auth:${versions.gms}", { exclude group: 'com.android.support' @@ -57,7 +83,6 @@ dependencies { implementation "com.google.guava:guava:${versions.guava}" debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakcanary}" - releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakcanary}" implementation "com.facebook.stetho:stetho:${versions.stetho}" implementation "com.google.code.gson:gson:${versions.gson}" @@ -72,14 +97,20 @@ dependencies { implementation "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}" implementation "com.google.zxing:core:${versions.zxing}" + implementation "com.google.android:flexbox:2.0.1" + implementation "com.airbnb.android:lottie:3.4.4" - testImplementation "androidx.test.ext:junit:1.1.1" + testImplementation "androidx.test:core:${versions.testCore}" + testImplementation "androidx.test.ext:junit:1.1.2" testImplementation "androidx.test:runner:${versions.testCore}" testImplementation "androidx.test:rules:${versions.testCore}" testImplementation "org.hamcrest:hamcrest-core:${versions.hamcrest}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.powermock:powermock-api-mockito:${versions.powermock}" testImplementation "org.robolectric:robolectric:${versions.robolectric}" + testImplementation "com.google.truth:truth:${versions.truth}" + testImplementation "androidx.test.ext:truth:1.3.0" + testImplementation "io.mockk:mockk:${versions.mockk}" androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}" androidTestImplementation "androidx.test.uiautomator:uiautomator:${versions.uiautomator}" diff --git a/build.gradle b/build.gradle index 5a28a99..21826f0 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'