Remove all RxJava1 dependencies

izumin5210 · Jan 2, 2018 · b96dcc4 · b96dcc4
1 parent 17d82c0
commit b96dcc4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,9 +44,8 @@ ext {
     databindingBaseLibraryVersion = '1.0'
     databindingLibraryVersion = '1.0-rc3'
     supportLibrariesVersion = '23.1.1'
-    rxJavaVersion = '1.1.0'
     rxJava2Version = '2.1.8'
-    rxAndroidVersion = '1.0.1'
+    rxAndroid2Version = '2.0.1'
     spockCoreVersion = '1.0-groovy-2.4'
     cglibVersion = '2.2'
 }
diff --git a/droidux-processor/build.gradle b/droidux-processor/build.gradle
@@ -19,7 +19,6 @@ dependencies {
     compile 'com.google.auto:auto-common:0.6'
     compile 'com.google.auto.service:auto-service:1.0-rc2'
 
-    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
     compile "io.reactivex.rxjava2:rxjava:${project.rxJava2Version}"
     compile "com.android.databinding:baseLibrary:${project.databindingBaseLibraryVersion}"
     compile fileTree(dir: './libs', includes: ['*.jar'])

diff --git a/examples/counter/build.gradle b/examples/counter/build.gradle
@@ -30,8 +30,8 @@ android {
 }
 
 dependencies {
-    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
-    compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
+    compile "io.reactivex.rxjava2:rxjava:${project.rxJava2Version}"
+    compile "io.reactivex.rxjava2:rxandroid:${project.rxAndroid2Version}"
     compile project(':droidux')
     annotationProcessor project(':droidux-processor')
     compile project(':middlewares:droidux-thunk')

diff --git a/examples/todomvc/build.gradle b/examples/todomvc/build.gradle
@@ -32,8 +32,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
-    compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
+    compile "io.reactivex.rxjava2:rxjava:${project.rxJava2Version}"
+    compile "io.reactivex.rxjava2:rxandroid:${project.rxAndroid2Version}"
     compile project(':droidux')
     annotationProcessor project(':droidux-processor')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"

diff --git a/examples/todos-with-dagger/build.gradle b/examples/todos-with-dagger/build.gradle
@@ -37,8 +37,8 @@ configurations.all {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
-    compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
+    compile "io.reactivex.rxjava2:rxjava:${project.rxJava2Version}"
+    compile "io.reactivex.rxjava2:rxandroid:${project.rxAndroid2Version}"
     compile project(':droidux')
     annotationProcessor project(':droidux-processor')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"

diff --git a/examples/todos-with-undo/build.gradle b/examples/todos-with-undo/build.gradle
@@ -32,8 +32,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
-    compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
+    compile "io.reactivex.rxjava2:rxjava:${project.rxJava2Version}"
+    compile "io.reactivex.rxjava2:rxandroid:${project.rxAndroid2Version}"
     compile project(':droidux')
     annotationProcessor project(':droidux-processor')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"