From 33167ad26f9c93448cea761b49b8d6df00460a00 Mon Sep 17 00:00:00 2001 From: Yura Laguta Date: Sat, 21 Oct 2017 15:49:11 +1100 Subject: [PATCH 1/2] Update gradle from 3.1 to 3.3 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7494219..2006a21 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 13 19:11:10 CEST 2016 +#Sat Oct 21 14:56:39 AEDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 46b074968ee00f8ac06630679989601b99215a27 Mon Sep 17 00:00:00 2001 From: Yura Laguta Date: Sat, 21 Oct 2017 16:56:43 +1100 Subject: [PATCH 2/2] Closes #208 Update rxJava to rxJava2:2.1.5 and rxLint, also gradle plugin for Stable AS, build tools version and build target --- app/build.gradle | 1 - dependencies.gradle | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dd51462..5ed02b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -116,7 +116,6 @@ dependencies { annotationProcessor libraries.daggerCompiler compile libraries.rxJava - releaseCompile libraries.rxJavaProguardRules compile libraries.rxLint compile libraries.okHttp diff --git a/dependencies.gradle b/dependencies.gradle index a4f74db..ffa05f4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,11 +3,11 @@ ext.versions = [ name : '1.0', minSdk : 16, - targetSdk : 23, - compileSdk : 23, - buildTools : '23.0.3', + targetSdk : 25, + compileSdk : 25, + buildTools : '25.0.3', - androidGradlePlugin : '2.2.1', + androidGradlePlugin : '2.3.3', retrolambdaGradlePlugin : '3.2.5', lombokGradlePlugin : '0.2.3.a2', paperworkGradlePlugin : '1.2.7', @@ -21,9 +21,8 @@ ext.versions = [ dagger : '2.6', - rxJava : '1.1.8', - rxJavaProguardRules : '1.1.8.0', - rxLint : '1.0', + rxJava : '2.1.5', + rxLint : '1.6', supportLibs : '23.1.1', okHttp : '3.2.0', retrofit : '2.0.0-beta4', @@ -68,8 +67,7 @@ ext.libraries = [ dagger : "com.google.dagger:dagger:$versions.dagger", daggerCompiler : "com.google.dagger:dagger-compiler:$versions.dagger", - rxJava : "io.reactivex:rxjava:$versions.rxJava", - rxJavaProguardRules : "com.artemzin.rxjava:proguard-rules:$versions.rxJavaProguardRules", + rxJava : "io.reactivex.rxjava2:rxjava:$versions.rxJava", rxLint : "nl.littlerobots.rxlint:rxlint:$versions.rxLint", okHttp : "com.squareup.okhttp3:okhttp:$versions.okHttp",