change the lifecycle manager to com.trello.rxlifecycle2 and clean a little bit

Author: micHar

liverelay/build.gradle

@@ -5,18 +5,15 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.futuremind'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion "26.0.2"
 
-
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
-        versionName "0.1.0"
-
+        versionName "0.1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
@@ -30,10 +27,10 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.github.florent37:rxlifecycle:2.0.4'
+    implementation 'com.android.support:appcompat-v7:27.0.1'
+    implementation 'com.trello.rxlifecycle2:rxlifecycle-android-lifecycle-kotlin:2.2.1'
     implementation 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
 }
 repositories {

liverelay/src/main/java/com/futuremind/liverelay/LiveRelay.kt

@@ -2,38 +2,23 @@ package com.futuremind.liverelay
 
 import android.arch.lifecycle.LifecycleOwner
 import com.jakewharton.rxrelay2.BehaviorRelay
-import florent37.github.com.rxlifecycle.RxLifecycle
+import com.trello.rxlifecycle2.android.lifecycle.kotlin.bindToLifecycle
 import io.reactivex.BackpressureStrategy.LATEST
 import io.reactivex.Flowable
-import io.reactivex.ObservableTransformer
 
 /**
  * LiveRelay can be used to process states between ViewModel and LifecycleOwner.
  *
- * Subscribers don't need to worry about unexpected onComplete or onError, it only passes
- * onNext events.
+ * Subscribers don't need to worry about unexpected onComplete or onError, it only passes onNext events.
  * Also, once observe is passed a valid [LifecycleOwner], subscribers don't need to worry about unsubscribing.
  */
-class LiveRelay<T>(private val lifecycleEvent: LifecycleEvent = LifecycleEvent.PAUSE) {
+class LiveRelay<T> {
 
     private val relay = BehaviorRelay.create<T>().toSerialized()
 
     fun observe(lifecycleOwner: LifecycleOwner): Flowable<T> =
-            relay.compose(lifecycleTransformer(lifecycleEvent, lifecycleOwner)).toFlowable(LATEST)
+            relay.bindToLifecycle(lifecycleOwner).toFlowable(LATEST)
 
     fun nextState(state: T) = relay.accept(state)
 
-    private fun lifecycleTransformer(lifecycleEvent: LifecycleEvent, lifecycleOwner: LifecycleOwner): ObservableTransformer<T, T> =
-            when (lifecycleEvent) {
-                LiveRelay.LifecycleEvent.PAUSE -> RxLifecycle.with(lifecycleOwner).disposeOnPause()
-                LiveRelay.LifecycleEvent.STOP -> RxLifecycle.with(lifecycleOwner).disposeOnStop()
-                LiveRelay.LifecycleEvent.DESTROY -> RxLifecycle.with(lifecycleOwner).disposeOnDestroy()
-            }
-
-    enum class LifecycleEvent {
-        PAUSE,
-        STOP,
-        DESTROY
-    }
-
 }

sample/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion "26.0.2"
     defaultConfig {
-        applicationId "com.futuremind.liverelay"
+        applicationId "com.futuremind.liverelay.sample"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,14 +21,16 @@ android {
     }
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'android.arch.lifecycle') {
+            details.useVersion '1.0.0'
+        }
+    }
+}
+
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    implementation 'com.android.support:appcompat-v7:27.0.1'
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     implementation project(':liverelay')
 }

sample/src/androidTest/java/com/futuremind/liverelay/ExampleInstrumentedTest.kt

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.futuremind.liverelay">
+    package="com.futuremind.liverelay.sample">
 
     <application
         android:allowBackup="true"
@@ -12,7 +12,6 @@
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

sample/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
-package com.futuremind.liverelay
+package com.futuremind.liverelay.sample
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
 

…com/futuremind/liverelay/MainActivity.kt …uremind/liverelay/sample/MainActivity.ktsample/src/main/java/com/futuremind/liverelay/MainActivity.kt renamed to sample/src/main/java/com/futuremind/liverelay/sample/MainActivity.kt sample/src/main/java/com/futuremind/liverelay/MainActivity.kt renamed to sample/src/main/java/com/futuremind/liverelay/sample/MainActivity.kt

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.futuremind.liverelay.MainActivity">
+    tools:context=".MainActivity">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:text="Hello World!" />
 
-</android.support.constraint.ConstraintLayout>
+</FrameLayout>