diff --git a/build.gradle b/build.gradle index e5c7b1a..16cf20f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'me.tatarka:gradle-retrolambda:3.3.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' @@ -41,14 +41,15 @@ ext { targetSdkVersion = 25 compileSdkVersion = 25 buildToolsVersion = '25.0.2' - supportVersion = '25.3.0' + supportVersion = '25.3.1' mosbyVersion = '2.0.1' rxJavaVersion = '2.0.8' rxAndroidVersion = '2.0.1' - databindingVersion = '1.2.1' + databindingVersion = '1.3.1' rxBindingVersion = '1.0.0' - butterKnifeVersion = '8.4.0' + butterKnifeVersion = '8.5.1' retrofitVersion = '2.0.2' + retrofitRxVersion = '1.0.0' okHttpVersion = '3.2.0' glideVersion = '3.7.0' robolectricVersion = '3.2-rc1' diff --git a/sample-independent-viper/build.gradle b/sample-independent-viper/build.gradle index b153b0d..4c6005f 100644 --- a/sample-independent-viper/build.gradle +++ b/sample-independent-viper/build.gradle @@ -40,10 +40,10 @@ dependencies { compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion - compile 'io.reactivex.rxjava2:rxandroid:2.0.1' - compile "com.github.akarnokd:rxjava2-interop:0.9.1" + compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion + compile "com.github.akarnokd:rxjava2-interop:0.9.5" compile 'io.reactivex.rxjava2:rxjava:' + rootProject.ext.rxJavaVersion diff --git a/sample-recyclerview/build.gradle b/sample-recyclerview/build.gradle index b3fbbde..2d99bba 100644 --- a/sample-recyclerview/build.gradle +++ b/sample-recyclerview/build.gradle @@ -48,7 +48,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') compile project(path: ':moviper-recyclerview') diff --git a/sample-rx-ai/build.gradle b/sample-rx-ai/build.gradle index a7a6c9d..3d6988d 100644 --- a/sample-rx-ai/build.gradle +++ b/sample-rx-ai/build.gradle @@ -45,7 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') compile project(path: ':moviper-butterknife') diff --git a/sample-rx-rdp/build.gradle b/sample-rx-rdp/build.gradle index 505a9b7..b811f4f 100644 --- a/sample-rx-rdp/build.gradle +++ b/sample-rx-rdp/build.gradle @@ -51,7 +51,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') diff --git a/sample-rx-viewstate/build.gradle b/sample-rx-viewstate/build.gradle index fe88428..e1afb6f 100644 --- a/sample-rx-viewstate/build.gradle +++ b/sample-rx-viewstate/build.gradle @@ -45,7 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:'+rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:'+rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:'+rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:'+rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') compile project(path: ':moviper-viewstate') diff --git a/sample-rx/build.gradle b/sample-rx/build.gradle index 7b4ad32..44afba3 100644 --- a/sample-rx/build.gradle +++ b/sample-rx/build.gradle @@ -46,7 +46,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') diff --git a/sample-service/build.gradle b/sample-service/build.gradle index dae7bfb..9ff9711 100644 --- a/sample-service/build.gradle +++ b/sample-service/build.gradle @@ -45,7 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:'+rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:'+rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:'+rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:'+rootProject.ext.okHttpVersion compile project(path: ':moviper-service') compile project(path: ':moviper-butterknife') diff --git a/sample-super-rx-ai-kotlin/build.gradle b/sample-super-rx-ai-kotlin/build.gradle index f36e586..d61a5c6 100644 --- a/sample-super-rx-ai-kotlin/build.gradle +++ b/sample-super-rx-ai-kotlin/build.gradle @@ -41,7 +41,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') androidTestCompile('com.android.support.test.espresso:espresso-core:' + rootProject.ext.espressoVersion, { diff --git a/sample-super-rx-ai/build.gradle b/sample-super-rx-ai/build.gradle index a7a6c9d..3d6988d 100644 --- a/sample-super-rx-ai/build.gradle +++ b/sample-super-rx-ai/build.gradle @@ -45,7 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') compile project(path: ':moviper-butterknife') diff --git a/sample-super-rx-databinding/build.gradle b/sample-super-rx-databinding/build.gradle index 44e6df3..a7240e7 100644 --- a/sample-super-rx-databinding/build.gradle +++ b/sample-super-rx-databinding/build.gradle @@ -45,7 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-rx') compile project(path: ':moviper-databinding') diff --git a/sample/build.gradle b/sample/build.gradle index 39b72a7..34ce8c1 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -45,7 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.ext.rxAndroidVersion compile 'com.squareup.retrofit2:retrofit:' + rootProject.ext.retrofitVersion compile 'com.squareup.retrofit2:converter-gson:' + rootProject.ext.retrofitVersion - compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:' + rootProject.ext.retrofitRxVersion compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.ext.okHttpVersion compile project(path: ':moviper-callbacks')