update dependencies versions + support for Android 3.6.1

andrzejchm · Mar 26, 2020 · 8a62dc5 · 8a62dc5
1 parent 2c1066b
commit 8a62dc5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -42,7 +42,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     api(project(':core'))
 
     implementation "androidx.test:rules:${androidXTestVersion}"

diff --git a/androidsample/build.gradle b/androidsample/build.gradle
@@ -56,13 +56,14 @@ configurations.all {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.0.0"
+    implementation "com.google.android.material:material:1.1.0"
+    //noinspection AnnotationProcessorOnCompilePath
     implementation "com.jakewharton:butterknife:${butterKnifeVersion}"
     annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
     implementation "com.google.dagger:dagger:${daggerVersion}"
     annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
-    implementation "com.squareup.retrofit2:retrofit:2.6.1"
-    implementation "com.squareup.retrofit2:converter-gson:2.6.1"
+    implementation "com.squareup.retrofit2:retrofit:2.7.2"
+    implementation "com.squareup.retrofit2:converter-gson:2.7.2"
     implementation "com.squareup.okhttp3:logging-interceptor:${okHttpVersion}"
     implementation "com.squareup.okhttp3:okhttp:${okHttpVersion}"
 
@@ -84,8 +85,8 @@ dependencies {
     androidTestImplementation project(":android")
 
     testImplementation "androidx.appcompat:appcompat:1.1.0"
-    testImplementation "com.google.android.material:material:1.0.0"
-    testImplementation "junit:junit:4.12"
+    testImplementation "com.google.android.material:material:1.1.0"
+    testImplementation "junit:junit:4.13"
     testImplementation "androidx.test.espresso:espresso-core:${espressoVersion}"
     testImplementation("androidx.test.espresso:espresso-contrib:${espressoVersion}")
     testImplementation project(":android")

diff --git a/build.gradle b/build.gradle
@@ -21,22 +21,22 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 ext {
-    libraryVersion = "0.4.1"
+    libraryVersion = "0.4.2"
     compileSdk = 29
     targetSdk = 29
-    minSdk = 14
-    buildTools = "29.0.0"
-    okHttpVersion = "4.0.1"
-    butterKnifeVersion = "10.1.0"
+    minSdk = 21
+    buildTools = "29.0.2"
+    okHttpVersion = "4.4.1"
+    butterKnifeVersion = "10.2.1"
     espressoVersion = "3.1.0"
     androidXTestVersion = "1.2.0"
-    daggerVersion = "2.20"
+    daggerVersion = "2.27"
 }
 
 allprojects {

diff --git a/core/build.gradle b/core/build.gradle
@@ -17,8 +17,6 @@
 apply plugin: "java"
 apply plugin: "maven"
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 group = "com.github.andrzejchm"
 
@@ -32,6 +30,9 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
 artifacts {
     archives sourcesJar
     archives javadocJar

diff --git a/gradle.properties b/gradle.properties
@@ -29,3 +29,4 @@
 # org.gradle.parallel=true
 
 org.gradle.configureondemand=true
+android.useAndroidX=true
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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip