Merge pull request #9 from andremion/development

Update master to release v1.0.2
andremion · Oct 26, 2017 · 1360217 · 1360217
2 parents 0d2d6ec + 5757cca
commit 1360217
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git 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"
+        versionCode = 4
+        versionName = "1.0.2"
 
-        supportLibraryVersion = '25.1.1'
+        supportLibraryVersion = '26.1.0'
 
         junitVersion = '4.12'
         espressoVersion = '2.2.+'

diff --git 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
@@ -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
@@ -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"
 }