From dedf2aaeb6e880b5ab7435478515dadb0e4a2f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Mion?= Date: Thu, 26 Oct 2017 10:04:51 +0100 Subject: [PATCH 1/2] - Upgrade android tools build gradle to 3.0.0 version - Upgrade build tools to 26.0.2 version - Upgrade support library to 26.1.0 version --- build.gradle | 12 +++++++----- counterfab/build.gradle | 10 ++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle | 12 +++++------- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 6bbeece..9436d86 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } } @@ -17,18 +18,19 @@ plugins { allprojects { repositories { jcenter() + google() } project.ext { - compileSdkVersion = 24 - buildToolsVersion = '25.0.2' + compileSdkVersion = 26 + buildToolsVersion = '26.0.2' minSdkVersion = 16 - targetSdkVersion = 24 + targetSdkVersion = 26 versionCode = 3 versionName = "1.0.1" - supportLibraryVersion = '25.1.1' + supportLibraryVersion = '26.1.0' junitVersion = '4.12' espressoVersion = '2.2.+' diff --git a/counterfab/build.gradle b/counterfab/build.gradle index 222d0e6..14d32cb 100644 --- a/counterfab/build.gradle +++ b/counterfab/build.gradle @@ -21,14 +21,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile "com.android.support:design:$supportLibraryVersion" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "com.android.support:design:$supportLibraryVersion" - testCompile "junit:junit:$junitVersion" + testImplementation "junit:junit:$junitVersion" - androidTestCompile("com.android.support.test.espresso:espresso-core:$espressoVersion", { - exclude group: 'com.android.support', module: 'support-annotations' - }) + androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion" } apply from: 'https://raw.githubusercontent.com/andremion/JCenter/master/deploy.gradle' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..fc9b829 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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-4.1-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index 1d5d51f..8e1c368 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -20,13 +20,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':counterfab') - compile "com.android.support:design:$supportLibraryVersion" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':counterfab') + implementation "com.android.support:design:$supportLibraryVersion" - testCompile "junit:junit:$junitVersion" + testImplementation "junit:junit:$junitVersion" - androidTestCompile("com.android.support.test.espresso:espresso-core:$espressoVersion", { - exclude group: 'com.android.support', module: 'support-annotations' - }) + androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion" } From 0fcf39cd0e060115bd0b870051ba478a8c8db5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Mion?= Date: Thu, 26 Oct 2017 10:19:29 +0100 Subject: [PATCH 2/2] - Bump to version 1.0.2 (4) --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9436d86..d276fc1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,8 @@ allprojects { minSdkVersion = 16 targetSdkVersion = 26 - versionCode = 3 - versionName = "1.0.1" + versionCode = 4 + versionName = "1.0.2" supportLibraryVersion = '26.1.0'