Skip to content

Commit fc6cbbc

Browse files
yongceyongce
committed
Upgrade JVM compatibility to Java 11 and upgrade the libraries
1 parent 2a54fe7 commit fc6cbbc

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎android_module_common.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ android {
134134
}
135135

136136
compileOptions {
137-
sourceCompatibility JavaVersion.VERSION_1_8
138-
targetCompatibility JavaVersion.VERSION_1_8
137+
sourceCompatibility JavaVersion.VERSION_11
138+
targetCompatibility JavaVersion.VERSION_11
139139
}
140140

141141
pluginManager.withPlugin('kotlin-android') {
142142
kotlinOptions {
143-
jvmTarget = "1.8"
143+
jvmTarget = "11"
144144
}
145145
}
146146

‎android_project_common.gradle

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,28 @@ ext {
3939

4040
// Android official support
4141
'kotlin' : '1.5.31',
42-
'kotlinCoroutine' : "1.4.1",
42+
'kotlinCoroutine' : "1.5.2",
4343
'multidexLib' : "2.0.1",
44-
'androidxCore' : '1.3.2',
45-
'fragment' : '1.3.2',
44+
'androidxCore' : '1.7.0',
45+
'fragment' : '1.3.6',
4646
'preference' : "1.1.1",
4747
'palette' : "1.0.0",
48-
'recyclerView' : "1.2.0",
49-
'constraintLayout' : "2.0.4",
48+
'recyclerView' : "1.2.1",
49+
'constraintLayout' : "2.1.1",
5050
'vectorDrawable' : "1.1.0",
5151
'lintLib' : '30.0.2',
5252
'archCore' : "2.1.0",
53-
'lifecycle' : "2.3.1",
54-
'room' : '2.2.6',
53+
'lifecycle' : "2.4.0",
54+
'room' : '2.3.0',
5555
'sqlite' : "2.1.0",
5656
'navigation' : "2.3.5",
57-
'paging' : "2.1.2",
58-
'work' : "2.5.0",
59-
'media2' : "1.1.2",
57+
'paging' : "3.0.1",
58+
'work' : "2.7.0",
59+
'media2' : "1.2.0",
6060

6161
// test
62-
'testCore' : "1.3.0",
63-
'espresso' : "3.3.0",
62+
'testCore' : "1.4.0",
63+
'espresso' : "3.4.0",
6464
'uiautomator' : "2.2.0",
6565
'truth' : '1.0.1',
6666
'hamcrest' : '2.2',
@@ -113,7 +113,7 @@ ext {
113113
],
114114
'androidx': [
115115
// core
116-
'annotation' : "androidx.annotation:annotation:1.2.0",
116+
'annotation' : "androidx.annotation:annotation:1.3.0",
117117
'core' : "androidx.core:core:${versions.androidxCore}",
118118
'coreKtx' : "androidx.core:core-ktx:${versions.androidxCore}",
119119
'fragment' : "androidx.fragment:fragment:${versions.fragment}",
@@ -122,8 +122,8 @@ ext {
122122
'collection' : "androidx.collection:collection:1.1.0",
123123
'collectionKtx' : "androidx.collection:collection-ktx:1.1.0",
124124
// UI
125-
'appcompat' : "androidx.appcompat:appcompat:1.2.0",
126-
'material' : "com.google.android.material:material:1.3.0",
125+
'appcompat' : "androidx.appcompat:appcompat:1.3.1",
126+
'material' : "com.google.android.material:material:1.4.0",
127127
'preference' : "androidx.preference:preference:${versions.preference}",
128128
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
129129
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
@@ -141,14 +141,14 @@ ext {
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.3.0",
145-
'transition' : "androidx.transition:transition:1.4.0",
144+
'browser' : "androidx.browser:browser:1.4.0",
145+
'transition' : "androidx.transition:transition:1.4.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}",
150-
'mediarouter' : "androidx.mediarouter:mediarouter:1.2.2",
151-
'exifinterface' : "androidx.exifinterface:exifinterface:1.3.2",
150+
'mediarouter' : "androidx.mediarouter:mediarouter:1.2.5",
151+
'exifinterface' : "androidx.exifinterface:exifinterface:1.3.3",
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.2",
224-
'junitKtx' : "androidx.test.ext:junit-ktx:1.1.2",
225-
'truthAndroidX' : "androidx.test.ext:truth:1.3.0",
223+
'junit' : "androidx.test.ext:junit:1.1.3",
224+
'junitKtx' : "androidx.test.ext:junit-ktx:1.1.3",
225+
'truthAndroidX' : "androidx.test.ext:truth:1.4.0",
226226
'truth' : "com.google.truth:truth:${versions.truth}",
227227
'truthJava8' : "com.google.truth.extensions:truth-java8-extension:${versions.truth}",
228228
// espresso

‎archLintRulesTestDemo/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ dependencies {
3838
implementation project(':archLib')
3939

4040
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
41-
implementation "androidx.appcompat:appcompat:1.2.0"
41+
implementation "androidx.appcompat:appcompat:1.3.1"
4242
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlinCoroutine}"
4343

4444
// The following dependencies are just for checking new versions of library
4545
implementation "androidx.core:core-ktx:${versions.androidxCore}"
4646
implementation "androidx.fragment:fragment-ktx:${versions.fragment}"
47-
implementation "com.google.android.material:material:1.3.0"
47+
implementation "com.google.android.material:material:1.4.0"
4848
implementation "androidx.multidex:multidex:${versions.multidexLib}"
49-
implementation "androidx.annotation:annotation:1.2.0"
49+
implementation "androidx.annotation:annotation:1.3.0"
5050
implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
5151
implementation "androidx.collection:collection-ktx:1.1.0"
5252
implementation "androidx.preference:preference-ktx:${versions.preference}"
@@ -63,11 +63,11 @@ dependencies {
6363
implementation "androidx.paging:paging-runtime-ktx:${versions.paging}"
6464
implementation "androidx.work:work-runtime:${versions.work}"
6565
implementation "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}"
66-
implementation "androidx.browser:browser:1.3.0"
67-
implementation "androidx.transition:transition:1.4.0"
66+
implementation "androidx.browser:browser:1.4.0"
67+
implementation "androidx.transition:transition:1.4.1"
6868
implementation "androidx.media2:media2-session:${versions.media2}"
69-
implementation "androidx.mediarouter:mediarouter:1.2.2"
70-
implementation "androidx.exifinterface:exifinterface:1.3.2"
69+
implementation "androidx.mediarouter:mediarouter:1.2.5"
70+
implementation "androidx.exifinterface:exifinterface:1.3.3"
7171

7272
implementation "androidx.arch.core:core-common:${versions.archCore}"
7373
implementation "androidx.lifecycle:lifecycle-runtime-ktx:${versions.lifecycle}"
@@ -101,15 +101,15 @@ dependencies {
101101
implementation "com.airbnb.android:lottie:3.4.4"
102102

103103
testImplementation "androidx.test:core:${versions.testCore}"
104-
testImplementation "androidx.test.ext:junit:1.1.2"
104+
testImplementation "androidx.test.ext:junit:1.1.3"
105105
testImplementation "androidx.test:runner:${versions.testCore}"
106106
testImplementation "androidx.test:rules:${versions.testCore}"
107107
testImplementation "org.hamcrest:hamcrest-core:${versions.hamcrest}"
108108
testImplementation "org.mockito:mockito-core:${versions.mockito}"
109109
testImplementation "org.powermock:powermock-api-mockito:${versions.powermock}"
110110
testImplementation "org.robolectric:robolectric:${versions.robolectric}"
111111
testImplementation "com.google.truth:truth:${versions.truth}"
112-
testImplementation "androidx.test.ext:truth:1.3.0"
112+
testImplementation "androidx.test.ext:truth:1.4.0"
113113
testImplementation "io.mockk:mockk:${versions.mockk}"
114114

115115
androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"

‎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:7.0.2'
14+
classpath 'com.android.tools.build:gradle:7.0.3'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
1616
}
1717
}

0 commit comments

Comments
 (0)