Skip to content

Commit 92b3915

Browse files
yongceyongce
committed
Upgrade AGP to v3.5.3 and library versions
1 parent fb9cfec commit 92b3915

File tree

8 files changed

+69
-33
lines changed

8 files changed

+69
-33
lines changed

‎android_project_common.gradle‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,33 @@ ext {
3232

3333
versions = [
3434
// compile
35-
'compileSdk' : 28,
35+
'compileSdk' : 29,
3636

3737
// Android official support
38-
'kotlin' : "1.3.31",
38+
'kotlin' : "1.3.61",
3939
'multidexLib' : "2.0.1",
40-
'androidxCore' : "1.0.2",
41-
'fragment' : "1.0.0",
42-
'preference' : "1.0.0",
40+
'androidxCore' : "1.1.0",
41+
'fragment' : "1.1.0",
42+
'preference' : "1.1.0",
4343
'palette' : "1.0.0",
44-
'recyclerView' : "1.0.0",
44+
'recyclerView' : "1.1.0",
4545
'constraintLayout' : "1.1.3",
46-
'vectorDrawable' : "1.0.0",
47-
'lintLib' : "26.4.0",
48-
'archCore' : "2.0.0",
49-
'lifecycle' : "2.0.0",
50-
'room' : "2.0.0",
46+
'vectorDrawable' : "1.1.0",
47+
'lintLib' : "26.5.3",
48+
'archCore' : "2.1.0",
49+
'lifecycle' : "2.1.0",
50+
'room' : "2.2.2",
5151
'sqlite' : "2.0.1",
52-
'navigation' : "2.0.0",
52+
'navigation' : "2.1.0",
5353
'paging' : "2.1.0",
54-
'work' : "2.0.1",
54+
'work' : "2.2.0",
55+
'media2' : "1.0.1",
5556

5657
// test
5758
'testCore' : "1.2.0",
58-
'espresso' : "3.1.0",
59+
'espresso' : "3.2.0",
5960
'uiautomator' : "2.2.0",
60-
'truth' : "0.42",
61+
'truth' : "1.0",
6162
'hamcrest' : "1.3",
6263
'mockito' : "1.10.19",
6364
'powermock' : "1.6.4",
@@ -86,7 +87,7 @@ ext {
8687
'okhttp' : "3.9.0",
8788
'retrofit' : "2.3.0",
8889
'glide' : "4.2.0",
89-
'glideTrans' : "3.0.1",
90+
'glideTrans' : "4.0.0",
9091

9192
// rx
9293
'rxjava' : "2.1.6",
@@ -111,33 +112,35 @@ ext {
111112
'fragment' : "androidx.fragment:fragment:${versions.fragment}",
112113
'fragmentKtx' : "androidx.fragment:fragment-ktx:${versions.fragment}",
113114
'localBroadcast' : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
114-
'collection' : "androidx.collection:collection:1.0.0",
115-
'collectionKtx' : "androidx.collection:collection-ktx:1.0.0",
115+
'collection' : "androidx.collection:collection:1.1.0",
116+
'collectionKtx' : "androidx.collection:collection-ktx:1.1.0",
116117
// UI
117-
'appcompat' : "androidx.appcompat:appcompat:1.0.2",
118-
'design' : "com.google.android.material:material:1.0.0",
118+
'appcompat' : "androidx.appcompat:appcompat:1.1.0",
119+
'material' : "com.google.android.material:material:1.0.0",
119120
'preference' : "androidx.preference:preference:${versions.preference}",
120121
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
121-
'constraintLayout' : "androidx.constraintlayout:constraintlayout:1.1.3",
122+
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
122123
'cardview' : "androidx.cardview:cardview:1.0.0",
123124
'gridlayout' : "androidx.gridlayout:gridlayout:1.0.0",
124125
'palette' : "androidx.palette:palette:${versions.palette}",
125126
'paletteKtx' : "androidx.palette:palette-ktx:${versions.palette}",
126127
'recyclerview' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
127128
'recyclerviewSelection' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
128129
'percent' : "androidx.percentlayout:percentlayout:1.0.0",
129-
'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.0.0",
130+
'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.1.0",
130131
'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.0.0",
131132
'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0",
132133
'viewPager' : "androidx.viewpager:viewpager:1.0.0",
134+
'viewPager2' : "androidx.viewpager2:viewpager2:1.0.0",
133135
'vectorDrawable' : "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}",
134136
'animatedVectorDrawable' : "androidx.vectordrawable:vectordrawable-animated:${versions.vectorDrawable}",
135-
'customtabs' : "androidx.browser:browser:1.0.0",
136-
'transition' : "androidx.transition:transition:1.0.1",
137+
'browser' : "androidx.browser:browser:1.0.0",
138+
'transition' : "androidx.transition:transition:1.2.0",
137139
// others
138140
'multidex' : "androidx.multidex:multidex:${versions.multidexLib}",
139-
'mediaCompat' : "androidx.media:media:1.0.1",
140-
'mediarouter' : "androidx.mediarouter:mediarouter:1.0.0",
141+
'mediaSession' : "androidx.media2:media2-session:${versions.media2}",
142+
'mediaExoPlayer' : "androidx.media2:media2-exoplayer:${versions.media2}",
143+
'mediarouter' : "androidx.mediarouter:mediarouter:1.1.0",
141144
'exifinterface' : "androidx.exifinterface:exifinterface:1.0.0",
142145
'wear' : "androidx.wear:wear:1.0.0",
143146
// legacy
@@ -202,10 +205,10 @@ ext {
202205
'rules' : "androidx.test:rules:${versions.testCore}",
203206
'monitor' : "androidx.test:monitor:${versions.testCore}",
204207
'orchestrator' : "androidx.test:orchestrator:${versions.testCore}",
205-
'truthAndroidX' : 'androidx.test.ext:truth:${versions.testCore}',
206208
// ext
207209
'junit' : "androidx.test.ext:junit:1.1.1",
208210
'junitKtx' : "androidx.test.ext:junit-ktx:1.1.1",
211+
'truthAndroidX' : 'androidx.test.ext:truth:1.2.0',
209212
'truth' : "com.google.truth:truth:${versions.truth}",
210213
'truthJava8' : "com.google.truth.extensions:truth-java8-extension:${versions.truth}",
211214
// espresso

‎archLintRulesTestDemo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
defaultConfig {
77
applicationId "me.ycdev.android.arch.demo"
88
minSdkVersion versions.minSdk
9-
targetSdkVersion 28
9+
targetSdkVersion 29
1010
versionCode 1
1111
versionName "1.0"
1212

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

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

‎gradle/wrapper/gradle-wrapper.jar‎

426 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Fri Dec 06 16:56:41 CST 2019
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎gradlew‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

‎gradlew.bat‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS="-Xmx64m"
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

‎jniLibDemo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply from: "${androidModuleCommon}"
66
android {
77
defaultConfig {
88
minSdkVersion versions.minSdk
9-
targetSdkVersion 28
9+
targetSdkVersion 29
1010

1111
applicationId "me.ycdev.android.lib.commonjni.demo"
1212
versionCode 1

0 commit comments

Comments
 (0)