Skip to content

Commit cdde39e

Browse files
yongceyongce
committed
Upgrade library versions
1 parent 461ac72 commit cdde39e

File tree

3 files changed

+59
-27
lines changed

3 files changed

+59
-27
lines changed

‎android_project_common.gradle

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ ext {
3838
'compileSdk' : 30,
3939

4040
// Android official support
41-
'kotlin' : '1.4.0',
42-
'kotlinCoroutine' : "1.3.7",
41+
'kotlin' : '1.4.10',
42+
'kotlinCoroutine' : "1.3.9",
4343
'multidexLib' : "2.0.1",
44-
'androidxCore' : '1.3.1',
44+
'androidxCore' : '1.3.2',
4545
'fragment' : '1.2.5',
46-
'preference' : "1.1.0",
46+
'preference' : "1.1.1",
4747
'palette' : "1.0.0",
4848
'recyclerView' : "1.1.0",
49-
'constraintLayout' : "2.0.0",
49+
'constraintLayout' : "2.0.2",
5050
'vectorDrawable' : "1.1.0",
5151
'lintLib' : '27.0.0',
5252
'archCore' : "2.1.0",
5353
'lifecycle' : "2.2.0",
5454
'room' : '2.2.5',
5555
'sqlite' : "2.1.0",
56-
'navigation' : "2.2.1",
57-
'paging' : "2.1.1",
58-
'work' : "2.3.3",
56+
'navigation' : "2.3.0",
57+
'paging' : "2.1.2",
58+
'work' : "2.4.0",
5959
'media2' : "1.0.3",
6060

6161
// test
62-
'testCore' : "1.2.0",
63-
'espresso' : "3.2.0",
62+
'testCore' : "1.3.0",
63+
'espresso' : "3.3.0",
6464
'uiautomator' : "2.2.0",
6565
'truth' : '1.0.1',
6666
'hamcrest' : '2.2',
67-
'mockito' : "2.25.0",
67+
'mockito' : "3.5.11",
6868
'powermock' : '1.6.6',
6969
'robolectric' : '4.3.1',
7070
'mockk' : "1.10.0",
@@ -79,7 +79,7 @@ ext {
7979
'guava' : "29.0-android",
8080

8181
// debug
82-
'leakcanary' : "1.6.3",
82+
'leakcanary' : "2.4",
8383
'stetho' : '1.5.1',
8484
'ktlint' : "0.36.0",
8585

@@ -123,7 +123,7 @@ ext {
123123
'collectionKtx' : "androidx.collection:collection-ktx:1.1.0",
124124
// UI
125125
'appcompat' : "androidx.appcompat:appcompat:1.2.0",
126-
'material' : "com.google.android.material:material:1.2.0",
126+
'material' : "com.google.android.material:material:1.2.1",
127127
'preference' : "androidx.preference:preference:${versions.preference}",
128128
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
129129
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
@@ -135,20 +135,20 @@ ext {
135135
'recyclerviewSelection' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
136136
'percent' : "androidx.percentlayout:percentlayout:1.0.0",
137137
'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.1.0",
138-
'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.0.0",
139-
'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0",
138+
'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.1.1",
139+
'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
140140
'viewPager' : "androidx.viewpager:viewpager:1.0.0",
141141
'viewPager2' : "androidx.viewpager2:viewpager2:1.0.0",
142142
'vectorDrawable' : "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}",
143143
'animatedVectorDrawable' : "androidx.vectordrawable:vectordrawable-animated:${versions.vectorDrawable}",
144-
'browser' : "androidx.browser:browser:1.0.0",
144+
'browser' : "androidx.browser:browser:1.2.0",
145145
'transition' : "androidx.transition:transition:1.3.1",
146146
// others
147147
'multidex' : "androidx.multidex:multidex:${versions.multidexLib}",
148148
'mediaSession' : "androidx.media2:media2-session:${versions.media2}",
149149
'mediaExoPlayer' : "androidx.media2:media2-exoplayer:${versions.media2}",
150150
'mediarouter' : "androidx.mediarouter:mediarouter:1.1.0",
151-
'exifinterface' : "androidx.exifinterface:exifinterface:1.0.0",
151+
'exifinterface' : "androidx.exifinterface:exifinterface:1.3.0",
152152
'wear' : "androidx.wear:wear:1.0.0",
153153
// legacy
154154
'coreUtils' : "androidx.legacy:legacy-support-core-utils:1.0.0",
@@ -220,9 +220,9 @@ ext {
220220
'monitor' : "androidx.test:monitor:${versions.testCore}",
221221
'orchestrator' : "androidx.test:orchestrator:${versions.testCore}",
222222
// ext
223-
'junit' : "androidx.test.ext:junit:1.1.1",
224-
'junitKtx' : "androidx.test.ext:junit-ktx:1.1.1",
225-
'truthAndroidX' : 'androidx.test.ext:truth:1.2.0',
223+
'junit' : "androidx.test.ext:junit:1.1.2",
224+
'junitKtx' : "androidx.test.ext:junit-ktx:1.1.2",
225+
'truthAndroidX' : "androidx.test.ext:truth:1.3.0",
226226
'truth' : "com.google.truth:truth:${versions.truth}",
227227
'truthJava8' : "com.google.truth.extensions:truth-java8-extension:${versions.truth}",
228228
// espresso
@@ -277,6 +277,7 @@ ext {
277277

278278
// UI
279279
'flexbox' : "com.google.android:flexbox:2.0.1",
280+
'lottie' : "com.airbnb.android:lottie:3.4.4",
280281

281282
// rx
282283
'rx': [

‎archLintRulesTestDemo/build.gradle

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,42 @@ android {
3737
dependencies {
3838
implementation project(':archLib')
3939

40-
implementation deps.kotlin.stdlib
41-
implementation deps.androidx.appcompat
40+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
41+
implementation "androidx.appcompat:appcompat:1.2.0"
42+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlinCoroutine}"
4243

4344
// The following dependencies are just for checking new versions of library
45+
implementation "androidx.core:core:${versions.androidxCore}"
46+
implementation "androidx.fragment:fragment:${versions.fragment}"
47+
implementation "com.google.android.material:material:1.2.1"
4448
implementation "androidx.multidex:multidex:${versions.multidexLib}"
4549
implementation "androidx.annotation:annotation:1.1.0"
50+
implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
51+
implementation "androidx.collection:collection:1.1.0"
52+
implementation "androidx.preference:preference:${versions.preference}"
4653
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
54+
implementation "androidx.cardview:cardview:1.0.0"
55+
implementation "androidx.gridlayout:gridlayout:1.0.0"
56+
implementation "androidx.palette:palette:${versions.palette}"
57+
implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
58+
implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
59+
implementation "androidx.drawerlayout:drawerlayout:1.1.1"
60+
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
61+
implementation "androidx.viewpager2:viewpager2:1.0.0"
62+
implementation "androidx.navigation:navigation-runtime:${versions.navigation}"
63+
implementation "androidx.paging:paging-runtime:${versions.paging}"
64+
implementation "androidx.work:work-runtime:${versions.work}"
65+
implementation "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}"
66+
implementation "androidx.browser:browser:1.2.0"
67+
implementation "androidx.transition:transition:1.3.1"
68+
implementation "androidx.media2:media2-session:${versions.media2}"
69+
implementation "androidx.mediarouter:mediarouter:1.1.0"
70+
implementation "androidx.exifinterface:exifinterface:1.3.0"
71+
4772
implementation "androidx.arch.core:core-common:${versions.archCore}"
48-
implementation "androidx.lifecycle:lifecycle-common:${versions.lifecycle}"
49-
implementation "androidx.room:room-common:${versions.room}"
73+
implementation "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}"
74+
implementation "androidx.room:room-runtime:${versions.room}"
75+
implementation "androidx.sqlite:sqlite:${versions.sqlite}"
5076

5177
implementation ("com.google.android.gms:play-services-auth:${versions.gms}", {
5278
exclude group: 'com.android.support'
@@ -57,7 +83,6 @@ dependencies {
5783
implementation "com.google.guava:guava:${versions.guava}"
5884

5985
debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakcanary}"
60-
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakcanary}"
6186
implementation "com.facebook.stetho:stetho:${versions.stetho}"
6287

6388
implementation "com.google.code.gson:gson:${versions.gson}"
@@ -72,14 +97,20 @@ dependencies {
7297
implementation "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}"
7398

7499
implementation "com.google.zxing:core:${versions.zxing}"
100+
implementation "com.google.android:flexbox:2.0.1"
101+
implementation "com.airbnb.android:lottie:3.4.4"
75102

76-
testImplementation "androidx.test.ext:junit:1.1.1"
103+
testImplementation "androidx.test:core:${versions.testCore}"
104+
testImplementation "androidx.test.ext:junit:1.1.2"
77105
testImplementation "androidx.test:runner:${versions.testCore}"
78106
testImplementation "androidx.test:rules:${versions.testCore}"
79107
testImplementation "org.hamcrest:hamcrest-core:${versions.hamcrest}"
80108
testImplementation "org.mockito:mockito-core:${versions.mockito}"
81109
testImplementation "org.powermock:powermock-api-mockito:${versions.powermock}"
82110
testImplementation "org.robolectric:robolectric:${versions.robolectric}"
111+
testImplementation "com.google.truth:truth:${versions.truth}"
112+
testImplementation "androidx.test.ext:truth:1.3.0"
113+
testImplementation "io.mockk:mockk:${versions.mockk}"
83114

84115
androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"
85116
androidTestImplementation "androidx.test.uiautomator:uiautomator:${versions.uiautomator}"

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212

1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:4.0.1'
14+
classpath 'com.android.tools.build:gradle:4.0.2'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
1616

1717
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

0 commit comments

Comments
 (0)