Skip to content

Commit

Permalink
Upgrade AGP to v3.5.3 and library versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@yongce
yongce committed Dec 6, 2019
1 parent fb9cfec commit 92b3915
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 33 deletions.
57 changes: 30 additions & 27 deletions android_project_common.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,33 @@ ext {

versions = [
// compile
'compileSdk' : 28,
'compileSdk' : 29,

// Android official support
'kotlin' : "1.3.31",
'kotlin' : "1.3.61",
'multidexLib' : "2.0.1",
'androidxCore' : "1.0.2",
'fragment' : "1.0.0",
'preference' : "1.0.0",
'androidxCore' : "1.1.0",
'fragment' : "1.1.0",
'preference' : "1.1.0",
'palette' : "1.0.0",
'recyclerView' : "1.0.0",
'recyclerView' : "1.1.0",
'constraintLayout' : "1.1.3",
'vectorDrawable' : "1.0.0",
'lintLib' : "26.4.0",
'archCore' : "2.0.0",
'lifecycle' : "2.0.0",
'room' : "2.0.0",
'vectorDrawable' : "1.1.0",
'lintLib' : "26.5.3",
'archCore' : "2.1.0",
'lifecycle' : "2.1.0",
'room' : "2.2.2",
'sqlite' : "2.0.1",
'navigation' : "2.0.0",
'navigation' : "2.1.0",
'paging' : "2.1.0",
'work' : "2.0.1",
'work' : "2.2.0",
'media2' : "1.0.1",

// test
'testCore' : "1.2.0",
'espresso' : "3.1.0",
'espresso' : "3.2.0",
'uiautomator' : "2.2.0",
'truth' : "0.42",
'truth' : "1.0",
'hamcrest' : "1.3",
'mockito' : "1.10.19",
'powermock' : "1.6.4",
Expand Down Expand Up @@ -86,7 +87,7 @@ ext {
'okhttp' : "3.9.0",
'retrofit' : "2.3.0",
'glide' : "4.2.0",
'glideTrans' : "3.0.1",
'glideTrans' : "4.0.0",

// rx
'rxjava' : "2.1.6",
Expand All @@ -111,33 +112,35 @@ ext {
'fragment' : "androidx.fragment:fragment:${versions.fragment}",
'fragmentKtx' : "androidx.fragment:fragment-ktx:${versions.fragment}",
'localBroadcast' : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
'collection' : "androidx.collection:collection:1.0.0",
'collectionKtx' : "androidx.collection:collection-ktx:1.0.0",
'collection' : "androidx.collection:collection:1.1.0",
'collectionKtx' : "androidx.collection:collection-ktx:1.1.0",
// UI
'appcompat' : "androidx.appcompat:appcompat:1.0.2",
'design' : "com.google.android.material:material:1.0.0",
'appcompat' : "androidx.appcompat:appcompat:1.1.0",
'material' : "com.google.android.material:material:1.0.0",
'preference' : "androidx.preference:preference:${versions.preference}",
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
'constraintLayout' : "androidx.constraintlayout:constraintlayout:1.1.3",
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
'cardview' : "androidx.cardview:cardview:1.0.0",
'gridlayout' : "androidx.gridlayout:gridlayout:1.0.0",
'palette' : "androidx.palette:palette:${versions.palette}",
'paletteKtx' : "androidx.palette:palette-ktx:${versions.palette}",
'recyclerview' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
'recyclerviewSelection' : "androidx.recyclerview:recyclerview:${versions.recyclerView}",
'percent' : "androidx.percentlayout:percentlayout:1.0.0",
'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.0.0",
'coordinatorLayout' : "androidx.coordinatorlayout:coordinatorlayout:1.1.0",
'drawerLayout' : "androidx.drawerlayout:drawerlayout:1.0.0",
'swipeRefreshLayout' : "androidx.swiperefreshlayout:swiperefreshlayout:1.0.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}",
'customtabs' : "androidx.browser:browser:1.0.0",
'transition' : "androidx.transition:transition:1.0.1",
'browser' : "androidx.browser:browser:1.0.0",
'transition' : "androidx.transition:transition:1.2.0",
// others
'multidex' : "androidx.multidex:multidex:${versions.multidexLib}",
'mediaCompat' : "androidx.media:media:1.0.1",
'mediarouter' : "androidx.mediarouter:mediarouter:1.0.0",
'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",
'wear' : "androidx.wear:wear:1.0.0",
// legacy
Expand Down Expand Up @@ -202,10 +205,10 @@ ext {
'rules' : "androidx.test:rules:${versions.testCore}",
'monitor' : "androidx.test:monitor:${versions.testCore}",
'orchestrator' : "androidx.test:orchestrator:${versions.testCore}",
'truthAndroidX' : 'androidx.test.ext:truth:${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',
'truth' : "com.google.truth:truth:${versions.truth}",
'truthJava8' : "com.google.truth.extensions:truth-java8-extension:${versions.truth}",
// espresso
Expand Down
2 changes: 1 addition & 1 deletion archLintRulesTestDemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "me.ycdev.android.arch.demo"
minSdkVersion versions.minSdk
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Fri Dec 06 16:56:41 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
18 changes: 17 additions & 1 deletion gradlew
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
Expand All @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

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

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
2 changes: 1 addition & 1 deletion jniLibDemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply from: "${androidModuleCommon}"
android {
defaultConfig {
minSdkVersion versions.minSdk
targetSdkVersion 28
targetSdkVersion 29

applicationId "me.ycdev.android.lib.commonjni.demo"
versionCode 1
Expand Down

0 comments on commit 92b3915

Please sign in to comment.