From c9ad7d4cba107eb750d86c52caadc883bbaf1ad4 Mon Sep 17 00:00:00 2001 From: ittianyu <86839868@qq.com> Date: Mon, 13 Mar 2017 22:49:30 +0800 Subject: [PATCH] Update gradle and support lib version. Delete android:allowBackup and android:supportsRtl. --- app/build.gradle | 11 ++++++----- build.gradle | 11 ++++++++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- widget/build.gradle | 12 ++++++------ widget/src/main/AndroidManifest.xml | 3 +-- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7f59b5c..1cfe59f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + defaultConfig { applicationId "com.ittianyu.bottomnavigationviewexsample" minSdkVersion 11 - targetSdkVersion 25 + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -27,7 +28,7 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.0' + compile "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" testCompile 'junit:junit:4.12' compile project(':widget') @@ -37,5 +38,5 @@ dependencies { testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' // badge - compile 'com.allenliu.badgeview:library:1.0.6' + compile 'com.allenliu.badgeview:library:1.1.1' } diff --git a/build.gradle b/build.gradle index df4cca9..69992c4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -22,3 +22,12 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } + +ext { + targetSdkVersion = 25 + buildToolsVersion = '25.0.1' + compileSdkVersion = 25 + + // Libraries + supportLibraryVersion = '25.2.0' +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..d67a5c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Mon Mar 13 22:31:28 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/widget/build.gradle b/widget/build.gradle index 48994a6..be7c9fa 100644 --- a/widget/build.gradle +++ b/widget/build.gradle @@ -4,14 +4,14 @@ apply plugin: 'com.github.dcendents.android-maven' group='com.github.ittianyu' android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion 11 - targetSdkVersion 25 - versionCode 7 - versionName "1.1.3" + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 8 + versionName "1.1.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -29,7 +29,7 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:design:25.1.0' + compile "com.android.support:design:$rootProject.supportLibraryVersion" testCompile 'junit:junit:4.12' } diff --git a/widget/src/main/AndroidManifest.xml b/widget/src/main/AndroidManifest.xml index 39d13ce..8a92d79 100644 --- a/widget/src/main/AndroidManifest.xml +++ b/widget/src/main/AndroidManifest.xml @@ -1,8 +1,7 @@ - +