From ebd9d9976edc4e266024673a10dcd2823c97c2d2 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Mon, 3 Apr 2017 16:06:27 +0100 Subject: [PATCH] Extract common versions into project root --- build.gradle | 9 ++++++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 8 ++++---- sample/build.gradle | 12 ++++++------ 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 682dcfb..7697ae8 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.novoda:bintray-release:0.4.0' } } @@ -25,4 +25,11 @@ ext { description = 'DrawerLayout-like ViewGroup, where a "drawer" is hidden under the content view, which can be shifted to make the drawer visible.' publishVersion = '1.0.2' licences = ['Apache-2.0'] + + compileSdkVersion = 25 + buildToolsVersion = '25.0.2' + minSdkVersion = 16 + targetSdkVersion = compileSdkVersion + + supportLibVersion = '25.3.1' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..0103a84 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 Apr 03 16:00:29 BST 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/library/build.gradle b/library/build.gradle index 8fc5ab7..f395667 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,17 +2,17 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion rootProject.ext.targetSdkVersion } } dependencies { - compile 'com.android.support:appcompat-v7:25.2.0' + compile "com.android.support:appcompat-v7:$supportLibVersion" } publish { diff --git a/sample/build.gradle b/sample/build.gradle index 98c01b3..ea0b534 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.yarolegovich.slidingrootnav.sample" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" } @@ -20,9 +20,9 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:25.2.0' - compile 'com.android.support:design:25.2.0' - compile 'com.android.support:recyclerview-v7:25.2.0' + compile "com.android.support:appcompat-v7:$supportLibVersion" + compile "com.android.support:design:$supportLibVersion" + compile "com.android.support:recyclerview-v7:$supportLibVersion" compile project(':library') }