Skip to content

Commit 02e2ff9

Browse files
committed
Upgrade Kotlin to v1.4.0
1 parent aa1e52b commit 02e2ff9

File tree

3 files changed

+37
-13
lines changed

3 files changed

+37
-13
lines changed

.idea/codeStyles/Project.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android_project_common.gradle

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* File: 'android_project_common.gradle'
33
* Location: https://raw.githubusercontent.com/yongce/AndroidLib/master/android_project_common.gradle
4-
* Version: 2020.07.19
4+
* Version: 2020.08.22
55
* All android projects can copy and include this file.
66
*/
77

@@ -22,6 +22,8 @@ allprojects {
2222
details.useVersion versions.lifecycle
2323
} else if (details.requested.group == 'androidx.room') {
2424
details.useVersion versions.room
25+
} else if (details.requested.group == 'org.jetbrains.kotlin') {
26+
details.useVersion versions.kotlin
2527
}
2628
}
2729
}
@@ -36,15 +38,15 @@ ext {
3638
'compileSdk' : 30,
3739

3840
// Android official support
39-
'kotlin' : '1.3.72',
41+
'kotlin' : '1.4.0',
4042
'kotlinCoroutine' : "1.3.7",
4143
'multidexLib' : "2.0.1",
42-
'androidxCore' : '1.3.0',
43-
'fragment' : '1.2.4',
44+
'androidxCore' : '1.3.1',
45+
'fragment' : '1.2.5',
4446
'preference' : "1.1.0",
4547
'palette' : "1.0.0",
4648
'recyclerView' : "1.1.0",
47-
'constraintLayout' : "1.1.3",
49+
'constraintLayout' : "2.0.0",
4850
'vectorDrawable' : "1.1.0",
4951
'lintLib' : '27.0.0',
5052
'archCore' : "2.1.0",
@@ -62,17 +64,17 @@ ext {
6264
'uiautomator' : "2.2.0",
6365
'truth' : '1.0.1',
6466
'hamcrest' : '2.2',
65-
'mockito' : "2.19.0",
67+
'mockito' : "2.25.0",
6668
'powermock' : '1.6.6',
6769
'robolectric' : '4.3.1',
68-
'mockk' : "1.9.3",
70+
'mockk' : "1.10.0",
6971

7072
// google
7173
'gms' : '18.0.0',
7274
'wearableSupport' : "2.3.0",
7375

7476
// infrastructure
75-
'butterknife' : "10.2.1",
77+
'butterknife' : "10.2.3",
7678
'timber' : "4.7.1",
7779
'guava' : "29.0-android",
7880

@@ -86,13 +88,13 @@ ext {
8688
'protobuf' : "3.1.0",
8789

8890
// network & image
89-
'okhttp' : '4.7.2',
91+
'okhttp' : '4.8.1',
9092
'retrofit' : '2.9.0',
9193
'glide' : '4.11.0',
9294
'glideTrans' : "4.0.0",
9395

9496
// rx
95-
'rxjava' : "2.2.6",
97+
'rxjava' : "2.2.12",
9698
'rxandroid' : "2.1.1",
9799

98100
// ycdev
@@ -104,7 +106,8 @@ ext {
104106
deps = [
105107
// Android official support
106108
'kotlin': [
107-
'stdlib' : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}",
109+
'stdlib' : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
110+
'reflect' : "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}",
108111
'coroutinesCore' : "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinCoroutine}",
109112
'coroutinesAndroid' : "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlinCoroutine}"
110113
],
@@ -119,8 +122,8 @@ ext {
119122
'collection' : "androidx.collection:collection:1.1.0",
120123
'collectionKtx' : "androidx.collection:collection-ktx:1.1.0",
121124
// UI
122-
'appcompat' : "androidx.appcompat:appcompat:1.1.0",
123-
'material' : "com.google.android.material:material:1.1.0",
125+
'appcompat' : "androidx.appcompat:appcompat:1.2.0",
126+
'material' : "com.google.android.material:material:1.2.0",
124127
'preference' : "androidx.preference:preference:${versions.preference}",
125128
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
126129
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",

archLintRules/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ apply plugin: 'kotlin'
33
dependencies {
44
compileOnly "com.android.tools.lint:lint-api:${versions.lintLib}"
55
compileOnly "com.android.tools.lint:lint-checks:${versions.lintLib}"
6+
// Workaround to fix the issue:
7+
// "Found more than one jar in the 'lintPublish' configuration. Only one file is supported"
8+
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
69

710
testImplementation "junit:junit:${versions.junit}"
811
testImplementation "com.android.tools.lint:lint:${versions.lintLib}"

0 commit comments

Comments
 (0)