Update rxjava/rxandroid to version 2

vincentbrison · Mar 10, 2017 · ab063c6 · ab063c6
1 parent 74593dc
commit ab063c6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,6 +43,7 @@ android {
         exclude 'META-INF/ASL2.0'
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
+        exclude 'META-INF/rxjava.properties'
     }
 
     productFlavors {
@@ -78,7 +79,7 @@ dependencies {
     compile 'com.squareup.retrofit2:converter-gson:2.2.0'
     compile 'com.squareup.retrofit2:adapter-rxjava:2.2.0'
     compile 'com.google.code.gson:gson:2.8.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
     // Dagger 2
     compile 'com.google.dagger:dagger:2.9'

diff --git a/app/src/daggerMockedPi/java/vb/android/app/quality/dagger/DataModule.java b/app/src/daggerMockedPi/java/vb/android/app/quality/dagger/DataModule.java
@@ -4,8 +4,8 @@
 
 import dagger.Module;
 import dagger.Provides;
+import io.reactivex.Observable;
 import retrofit2.http.Path;
-import rx.Observable;
 import vb.android.app.quality.rest.ApiInterface;
 import vb.android.app.quality.rest.ResponseRank;
 

diff --git a/app/src/main/java/vb/android/app/quality/rest/ApiInterface.java b/app/src/main/java/vb/android/app/quality/rest/ApiInterface.java
@@ -16,9 +16,9 @@
 
 package vb.android.app.quality.rest;
 
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
-import rx.Observable;
 
 /**
  * Describe the REST API with which the app is communicating

diff --git a/app/src/main/java/vb/android/app/quality/ui/MainActivity.java b/app/src/main/java/vb/android/app/quality/ui/MainActivity.java
@@ -31,9 +31,10 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import vb.android.app.quality.InjectorHelper;
 import vb.android.app.quality.R;
 import vb.android.app.quality.pi.PiTask;
@@ -180,7 +181,7 @@ private void setState(State state) {
     }
 
     @Override
-    public void onCompleted() {
+    public void onComplete() {
         setProgressBarIndeterminateVisibility(false);
     }
 
@@ -190,6 +191,10 @@ public void onError(Throwable e) {
         setState(State.IS_PI_COMPUTED);
     }
 
+    @Override
+    public void onSubscribe(Disposable disposable) {
+    }
+
     @Override
     public void onNext(ResponseRank responseRank) {
         setState(State.IS_RANK_READY);