From ff0c8a25638124081420d3bda6cd307c172a1705 Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 13:34:43 +0200 Subject: [PATCH] dependencies update (most recent, compiling/working libs at the moment) --- app/proguard-rules.pro | 7 +++++++ build.gradle | 6 ++++-- buildsystem/dependencies.gradle | 28 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index b7ffcdd..4be74f5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -2,9 +2,16 @@ -dontobfuscate # Only because of easy debugging +-dontwarn org.conscrypt.** +-dontwarn javax.lang.model.** +-dontwarn javax.tools.** +-dontwarn java.lang.instrument.** +-dontwarn java.lang.ClassValue + # === RxJava === -dontwarn sun.misc.** +-dontwarn sun.reflect.** -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* { long producerIndex; diff --git a/build.gradle b/build.gradle index a020175..845bd57 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,9 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.5.1' - classpath 'org.jacoco:org.jacoco.core:0.8.1' - classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0' + classpath 'org.jacoco:org.jacoco.core:0.8.5' + classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.0' + classpath "com.github.ben-manes:gradle-versions-plugin:0.27.0" } } @@ -21,4 +22,5 @@ allprojects { } } +apply plugin: "com.github.ben-manes.versions" apply from: 'buildsystem/dependencies.gradle' \ No newline at end of file diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 5c11ef1..1f66239 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -4,31 +4,31 @@ ext { // //Annotation processor dependencies - daggerVersion = '2.14.1' - autoFactoryVersion = '1.0-beta3' - butterknifeVersion = '10.1.0' + daggerVersion = '2.24' + autoFactoryVersion = '1.0-beta7' + butterknifeVersion = '10.2.0' //Standard dependencies supportLibraryVersion = '1.0.0' javaxAnnotationsVersion = '10.0-b28' - autoFactoryVersion = '1.0-beta3' + autoFactoryVersion = '1.0-beta7' rxAndroidVersion = '1.2.1' - rxJavaVersion = '1.3.2' + rxJavaVersion = '1.3.8' rxBindingVersion = '1.0.1' - timberVersion = '4.5.1' - retrofitVersion = '2.3.0' + timberVersion = '4.7.1' + retrofitVersion = '2.6.2' gsonVersion = '2.3.0' - okhttpVersion = '3.10.0' - guavaVersion = '26.0-android' + okhttpVersion = '4.2.2' + guavaVersion = '28.1-android' // Testing dependencies - junitVersion = '4.12' - mockitoVersion = '2.21.0' + junitVersion = '4.13-beta-3' + mockitoVersion = '3.1.0' //Functional/end-to-end testing dependencies - espressoVersion = '3.1.0-alpha3' - testRunnerVersion = '1.1.0-alpha3' - testRulesVersion = '1.1.0-alpha3' + espressoVersion = '3.3.0-alpha02' + testRunnerVersion = '1.3.0-alpha02' + testRulesVersion = '1.3.0-alpha02' // // ===== Libraries =====