Merge pull request #152 from trello/dlew/rxjava-1.2.0

Updated to RxJava 1.2.0

README.md

@@ -31,7 +31,7 @@ terminate on `STOP`. If you subscribe after `PAUSE`, it will terminate at the ne
 ## Single and Completable
 
 RxLifecycle supports both `Single` and `Completable` via the `LifecycleTransformer`. You can
-convert any returned `LifecycleTransformer` into a `Single.Transformer` or `CompletableTransformer`
+convert any returned `LifecycleTransformer` into a `Single.Transformer` or `Completable.Transformer`
 via the `forSingle()` and `forCompletable()` methods:
 
 ```java

build.gradle

@@ -33,7 +33,7 @@ ext {
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 
     // Define all dependencies in the base project, to unify & make it easy to update
-    rxJava = 'io.reactivex:rxjava:1.1.9'
+    rxJava = 'io.reactivex:rxjava:1.2.0'
     rxBinding = 'com.jakewharton.rxbinding:rxbinding:0.4.0'
     navi = 'com.trello:navi:0.2.2'
     kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:$verKotlin"

rxlifecycle/src/main/java/com/trello/rxlifecycle/LifecycleTransformer.java

@@ -33,6 +33,6 @@ public interface LifecycleTransformer<T> extends Observable.Transformer<T, T> {
      */
     @Nonnull
     @CheckReturnValue
-    Completable.CompletableTransformer forCompletable();
+    Completable.Transformer forCompletable();
 
 }

rxlifecycle/src/main/java/com/trello/rxlifecycle/UntilCorrespondingEventCompletableTransformer.java

@@ -14,7 +14,7 @@
  * That lifecycle event is determined based on what stage we're at in
  * the current lifecycle.
  */
-final class UntilCorrespondingEventCompletableTransformer<T> implements Completable.CompletableTransformer {
+final class UntilCorrespondingEventCompletableTransformer<T> implements Completable.Transformer {
 
     final Observable<T> sharedLifecycle;
     final Func1<T, T> correspondingEvents;

rxlifecycle/src/main/java/com/trello/rxlifecycle/UntilCorrespondingEventObservableTransformer.java

@@ -39,7 +39,7 @@ public Single.Transformer<T, T> forSingle() {
 
     @Nonnull
     @Override
-    public Completable.CompletableTransformer forCompletable() {
+    public Completable.Transformer forCompletable() {
         return new UntilCorrespondingEventCompletableTransformer<>(sharedLifecycle, correspondingEvents);
     }
 

rxlifecycle/src/main/java/com/trello/rxlifecycle/UntilEventCompletableTransformer.java

@@ -10,7 +10,7 @@
 /**
  * Continues a subscription until it sees a particular lifecycle event.
  */
-final class UntilEventCompletableTransformer<T> implements Completable.CompletableTransformer {
+final class UntilEventCompletableTransformer<T> implements Completable.Transformer {
 
     final Observable<T> lifecycle;
     final T event;

rxlifecycle/src/main/java/com/trello/rxlifecycle/UntilEventObservableTransformer.java

@@ -34,7 +34,7 @@ public Single.Transformer<T, T> forSingle() {
 
     @Nonnull
     @Override
-    public Completable.CompletableTransformer forCompletable() {
+    public Completable.Transformer forCompletable() {
         return new UntilEventCompletableTransformer<>(lifecycle, event);
     }
 

rxlifecycle/src/main/java/com/trello/rxlifecycle/UntilLifecycleCompletableTransformer.java

@@ -8,7 +8,7 @@
 /**
  * Continues a subscription until it sees *any* lifecycle event.
  */
-final class UntilLifecycleCompletableTransformer<T> implements Completable.CompletableTransformer {
+final class UntilLifecycleCompletableTransformer<T> implements Completable.Transformer {
 
     final Observable<T> lifecycle;
 

rxlifecycle/src/main/java/com/trello/rxlifecycle/UntilLifecycleObservableTransformer.java

@@ -30,7 +30,7 @@ public Single.Transformer<T, T> forSingle() {
 
     @Nonnull
     @Override
-    public Completable.CompletableTransformer forCompletable() {
+    public Completable.Transformer forCompletable() {
         return new UntilLifecycleCompletableTransformer<>(lifecycle);
     }