Update libraries, build tools, gradle version, ...

AdevintaSpain · Jun 22, 2018 · 2d4b8e3 · 2d4b8e3
1 parent be35e74
commit 2d4b8e3
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 37 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,33 +1,42 @@
 buildscript {
-  ext.kotlin_version = '1.1.51'
-  repositories {
+    ext.kotlin_version = '1.2.50'
+    repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.novoda:bintray-release:0.8.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
         maven {
             url "https://maven.google.com"
         }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-ext.minSdkVersionDeclared = 9
-ext.compileSdkVersionDeclared = 25
-ext.buildToolsVersionDeclared = '25.0.3'
+ext.minSdkVersionDeclared = 14
+ext.compileSdkVersionDeclared = 28
+ext.buildToolsVersionDeclared = '27.0.3'
 
-ext.supportLibVersion = '25.4.0'
-ext.espressoVersion = '3.0.1'
-ext.uiAutomatorVersion = '2.1.2'
+ext.supportLibVersion = '27.1.1'
+ext.espressoVersion = '3.0.2'
+ext.uiAutomatorVersion = '2.1.3'
 ext.baristaVersion = '2.4.0'
diff --git a/config/android-quality.gradle b/config/android-quality.gradle
@@ -81,7 +81,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: 'testDebugUnitTest') {
     html.enabled = true
   }
 
-  jacocoClasspath = configurations['androidJacocoAnt']
+  jacocoClasspath = configurations['jacocoAnt']
 
   def fileFilter = ['**/R.class',
                     '**/R$*.class',

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 16 16:31:24 CEST 2017
+#Fri Jun 22 19:23:07 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -19,21 +19,22 @@ android {
 }
 
 dependencies {
-    compile "com.android.support.test.espresso:espresso-core:$espressoVersion"
-    compile "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
-    compile "com.android.support.test.uiautomator:uiautomator-v18:$uiAutomatorVersion"
-    compile "com.android.support.test.espresso:espresso-intents:$espressoVersion"
-
-    compile "com.android.support:support-annotations:$supportLibVersion"
-    compile "com.android.support:support-core-ui:$supportLibVersion"
-    compile "com.android.support:recyclerview-v7:$supportLibVersion"
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-
-    testCompile 'junit:junit:4.12'
-    testCompile 'pl.pragmatists:JUnitParams:1.1.0'
-    testCompile 'org.assertj:assertj-core:1.7.0'
-    testCompile 'org.mockito:mockito-core:2.8.9'
+    api "com.android.support.test.espresso:espresso-core:$espressoVersion"
+    api "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
+    api "com.android.support.test.uiautomator:uiautomator-v18:$uiAutomatorVersion"
+    api "com.android.support.test.espresso:espresso-intents:$espressoVersion"
+
+    implementation "com.android.support:support-annotations:$supportLibVersion"
+    implementation "com.android.support:support-core-ui:$supportLibVersion"
+    implementation "com.android.support:animated-vector-drawable:$supportLibVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'pl.pragmatists:JUnitParams:1.1.0'
+    testImplementation 'org.assertj:assertj-core:1.7.0'
+    testImplementation 'org.mockito:mockito-core:2.13.0'
 }
 
 publish {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -23,16 +23,21 @@ android {
 }
 
 dependencies {
-  compile "com.android.support:support-v4:$supportLibVersion"
-  compile "com.android.support:appcompat-v7:$supportLibVersion"
-  compile "com.android.support:recyclerview-v7:$supportLibVersion"
-  compile "com.android.support:design:$supportLibVersion"
-  compile "com.android.support:support-annotations:$supportLibVersion"
-  compile 'com.github.bumptech.glide:glide:3.8.0'
+  implementation "com.android.support:support-v4:$supportLibVersion"
+  implementation "com.android.support:appcompat-v7:$supportLibVersion"
+  implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+  implementation "com.android.support:design:$supportLibVersion"
+  implementation "com.android.support:support-annotations:$supportLibVersion"
+  implementation 'com.github.bumptech.glide:glide:4.7.1'
 
-  compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+  androidTestApi "com.android.support.test.espresso:espresso-core:$espressoVersion"
+  androidTestApi "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
+  androidTestApi "com.android.support.test.uiautomator:uiautomator-v18:$uiAutomatorVersion"
+  androidTestApi "com.android.support.test.espresso:espresso-intents:$espressoVersion"
 
-  testCompile 'junit:junit:4.12'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-  androidTestCompile project(':library')
+  testImplementation 'junit:junit:4.12'
+
+  androidTestImplementation project(':library')
 }