Fixed lifecycle everywhere and moved rxlifecycle to misc in dependenc…

…ies.gradle
uber · Oct 21, 2017 · cbf3e10 · cbf3e10
1 parent ad33a87
commit cbf3e10
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/autodispose-rxlifecycle/build.gradle b/autodispose-rxlifecycle/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     testApt deps.build.nullAway
 
     compile project(':autodispose')
-    api deps.rx.lifecycle
+    api deps.misc.lifecycle
     compileOnly deps.misc.errorProneAnnotations
     compileOnly deps.misc.javaxExtras
 

diff --git a/autodispose-rxlifecycle/gradle.properties b/autodispose-rxlifecycle/gradle.properties
@@ -1,3 +1,3 @@
-POM_NAME=AutoDispose (RXLifeCycle Interop)
+POM_NAME=AutoDispose (RXLifecycle Interop)
 POM_ARTIFACT_ID=autodispose-rxlifecycle
 POM_PACKAGING=jar
diff --git a/...rxlifecycle/src/test/java/com/ubercab/autodispose/rxlifecycle/RXLifecycleInteropTest.java b/...rxlifecycle/src/test/java/com/ubercab/autodispose/rxlifecycle/RXLifecycleInteropTest.java
@@ -79,7 +79,7 @@ public void bindLifecycle_outsideLifecycleBound_unsubscribe() {
     source.onNext(2);
     o.assertNoMoreEvents();
     assertThat(
-        source.hasObservers()).isFalse(); // Because RXLifeCycle treats lifecycle ended exception as terminal event.
+        source.hasObservers()).isFalse(); // Because RXLifecycle treats lifecycle ended exception as terminal event.
   }
 
   @Test

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -52,13 +52,13 @@ def kotlin = [
 def misc = [
     errorProneAnnotations: "com.google.errorprone:error_prone_annotations:${versions.errorProne}",
     javaxExtras: "com.uber.javaxextras:javax-extras:0.1.0",
-    jsr305: 'com.google.code.findbugs:jsr305:3.0.2'
+    jsr305: 'com.google.code.findbugs:jsr305:3.0.2',
+    lifecycle: 'com.trello.rxlifecycle2:rxlifecycle:2.2.0'
 ]
 
 def rx = [
     android: 'io.reactivex.rxjava2:rxandroid:2.0.1',
-    java: 'io.reactivex.rxjava2:rxjava:2.1.0',
-    lifecycle: 'com.trello.rxlifecycle2:rxlifecycle:2.2.0'
+    java: 'io.reactivex.rxjava2:rxjava:2.1.0'
 ]
 
 def support = [