Extract binder from mvicore to a separate module

badoo · Jul 30, 2020 · 07a8480 · 07a8480
1 parent 773386a
commit 07a8480
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 755 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = '1.3.40'
+    ext.kotlinVersion = '1.3.72'
 
     repositories {
         google()

diff --git a/mvicore-android/src/main/java/com/badoo/mvicore/android/AndroidBindings.kt b/mvicore-android/src/main/java/com/badoo/mvicore/android/AndroidBindings.kt
@@ -1,9 +1,7 @@
 package com.badoo.mvicore.android
 
 import android.arch.lifecycle.LifecycleOwner
-import com.badoo.mvicore.binder.Binder
-import android.arch.lifecycle.Lifecycle as AndroidLifecycle
-import com.badoo.mvicore.binder.lifecycle.Lifecycle as BinderLifecycle
+import com.badoo.binder.Binder
 
 abstract class AndroidBindings<T : Any>(
     lifecycleOwner: LifecycleOwner

diff --git a/...e-android/src/main/java/com/badoo/mvicore/android/lifecycle/BaseAndroidBinderLifecycle.kt b/...e-android/src/main/java/com/badoo/mvicore/android/lifecycle/BaseAndroidBinderLifecycle.kt
@@ -5,7 +5,7 @@ import android.arch.lifecycle.LifecycleObserver
 import io.reactivex.ObservableSource
 import io.reactivex.subjects.BehaviorSubject
 import android.arch.lifecycle.Lifecycle as AndroidLifecycle
-import com.badoo.mvicore.binder.lifecycle.Lifecycle as BinderLifecycle
+import com.badoo.binder.lifecycle.Lifecycle as BinderLifecycle
 
 abstract class BaseAndroidBinderLifecycle private constructor(
     androidLifecycle: AndroidLifecycle,

diff --git a/...android/src/main/java/com/badoo/mvicore/android/lifecycle/CreateDestroyBinderLifecycle.kt b/...android/src/main/java/com/badoo/mvicore/android/lifecycle/CreateDestroyBinderLifecycle.kt
@@ -3,7 +3,7 @@ package com.badoo.mvicore.android.lifecycle
 import android.arch.lifecycle.DefaultLifecycleObserver
 import android.arch.lifecycle.LifecycleOwner
 import android.arch.lifecycle.Lifecycle as AndroidLifecycle
-import com.badoo.mvicore.binder.lifecycle.Lifecycle as BinderLifecycle
+import com.badoo.binder.lifecycle.Lifecycle as BinderLifecycle
 
 
 class CreateDestroyBinderLifecycle(

diff --git a/mvicore-android/src/main/java/com/badoo/mvicore/android/lifecycle/LifecycleExtensions.kt b/mvicore-android/src/main/java/com/badoo/mvicore/android/lifecycle/LifecycleExtensions.kt
@@ -1,7 +1,7 @@
 package com.badoo.mvicore.android.lifecycle
 
 import android.arch.lifecycle.Lifecycle
-import com.badoo.mvicore.binder.Binder
+import com.badoo.binder.Binder
 
 fun Lifecycle.createDestroy(f: Binder.() -> Unit) {
     Binder(CreateDestroyBinderLifecycle(this)).apply(f)

diff --git a/...e-android/src/main/java/com/badoo/mvicore/android/lifecycle/ResumePauseBinderLifecycle.kt b/...e-android/src/main/java/com/badoo/mvicore/android/lifecycle/ResumePauseBinderLifecycle.kt
@@ -3,7 +3,7 @@ package com.badoo.mvicore.android.lifecycle
 import android.arch.lifecycle.DefaultLifecycleObserver
 import android.arch.lifecycle.LifecycleOwner
 import android.arch.lifecycle.Lifecycle as AndroidLifecycle
-import com.badoo.mvicore.binder.lifecycle.Lifecycle as BinderLifecycle
+import com.badoo.binder.lifecycle.Lifecycle as BinderLifecycle
 
 
 class ResumePauseBinderLifecycle(

diff --git a/...ore-android/src/main/java/com/badoo/mvicore/android/lifecycle/StartStopBinderLifecycle.kt b/...ore-android/src/main/java/com/badoo/mvicore/android/lifecycle/StartStopBinderLifecycle.kt
@@ -3,7 +3,7 @@ package com.badoo.mvicore.android.lifecycle
 import android.arch.lifecycle.DefaultLifecycleObserver
 import android.arch.lifecycle.LifecycleOwner
 import android.arch.lifecycle.Lifecycle as AndroidLifecycle
-import com.badoo.mvicore.binder.lifecycle.Lifecycle as BinderLifecycle
+import com.badoo.binder.lifecycle.Lifecycle as BinderLifecycle
 
 
 class StartStopBinderLifecycle(

diff --git a/mvicore-demo/mvicore-demo-app/src/main/java/com/badoo/mvicoredemo/App.kt b/mvicore-demo/mvicore-demo-app/src/main/java/com/badoo/mvicoredemo/App.kt
@@ -2,12 +2,12 @@ package com.badoo.mvicoredemo
 
 import android.annotation.SuppressLint
 import android.app.Application
+import com.badoo.binder.middleware.config.MiddlewareConfiguration
+import com.badoo.binder.middleware.config.Middlewares
+import com.badoo.binder.middleware.config.WrappingCondition
 import com.badoo.mvicore.consumer.middleware.LoggingMiddleware
 import com.badoo.mvicore.consumer.middleware.PlaybackMiddleware
 import com.badoo.mvicore.consumer.middleware.PlaybackMiddleware.RecordStore
-import com.badoo.mvicore.consumer.middlewareconfig.MiddlewareConfiguration
-import com.badoo.mvicore.consumer.middlewareconfig.Middlewares
-import com.badoo.mvicore.consumer.middlewareconfig.WrappingCondition
 import com.badoo.mvicore.middleware.DefaultPluginStore
 import com.badoo.mvicore.middleware.IdeaPluginMiddleware
 import com.badoo.mvicoredemo.di.appscope.component.AppScopedComponent

diff --git a/...vicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/lifecycle/LifecycleDemoActivity.kt b/...vicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/lifecycle/LifecycleDemoActivity.kt
@@ -5,11 +5,11 @@ import android.support.v4.view.GravityCompat
 import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.view.MenuItem
+import com.badoo.binder.Binder
+import com.badoo.binder.named
 import com.badoo.mvicore.android.lifecycle.CreateDestroyBinderLifecycle
 import com.badoo.mvicore.android.lifecycle.ResumePauseBinderLifecycle
 import com.badoo.mvicore.android.lifecycle.StartStopBinderLifecycle
-import com.badoo.mvicore.binder.Binder
-import com.badoo.mvicore.binder.named
 import com.badoo.mvicoredemo.R
 import init
 import io.reactivex.functions.Consumer

diff --git a/...demo/mvicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/main/MainActivityBindings.kt b/...demo/mvicore-demo-app/src/main/java/com/badoo/mvicoredemo/ui/main/MainActivityBindings.kt
@@ -1,10 +1,10 @@
 package com.badoo.mvicoredemo.ui.main
 
+import com.badoo.binder.named
+import com.badoo.binder.using
 import com.badoo.feature1.Feature1
 import com.badoo.feature2.Feature2
 import com.badoo.mvicore.android.AndroidBindings
-import com.badoo.mvicore.binder.named
-import com.badoo.mvicore.binder.using
 import com.badoo.mvicoredemo.ui.main.analytics.FakeAnalyticsTracker
 import com.badoo.mvicoredemo.ui.main.event.UiEventTransformer1
 import com.badoo.mvicoredemo.ui.main.event.UiEventTransformer2

diff --git a/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/DefaultPluginStore.kt b/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/DefaultPluginStore.kt
@@ -1,7 +1,6 @@
 package com.badoo.mvicore.middleware
 
-import com.badoo.mvicore.binder.Connection
-import com.badoo.mvicore.middleware.data.parse
+import com.badoo.binder.Connection
 import com.badoo.mvicore.middleware.gc.QueueWatcher
 import com.badoo.mvicore.middleware.gson.MviPluginTypeAdapterFactory
 import com.badoo.mvicore.middleware.gson.SuperclassExclusionStrategy

diff --git a/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/IdeaPluginMiddleware.kt b/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/IdeaPluginMiddleware.kt
@@ -1,7 +1,7 @@
 package com.badoo.mvicore.middleware
 
-import com.badoo.mvicore.binder.Connection
-import com.badoo.mvicore.consumer.middleware.base.Middleware
+import com.badoo.binder.Connection
+import com.badoo.binder.middleware.base.Middleware
 import io.reactivex.functions.Consumer
 
 class IdeaPluginMiddleware<Out: Any, In: Any>(

diff --git a/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/data/Connection.kt b/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/data/Connection.kt
@@ -1,8 +1,6 @@
 package com.badoo.mvicore.middleware.data
 
-import com.badoo.mvicore.binder.Connection
-import com.badoo.mvicore.plugin.model.ConnectionData
-import com.badoo.mvicore.plugin.model.Id
+import com.badoo.binder.Connection
 
 fun Connection<out Any, out Any>.parse() =
     ConnectionData(

diff --git a/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/gc/QueueWatcher.kt b/mvicore-plugin/middleware/src/main/java/com/badoo/mvicore/middleware/gc/QueueWatcher.kt
@@ -1,6 +1,6 @@
 package com.badoo.mvicore.middleware.gc
 
-import com.badoo.mvicore.binder.Connection
+import com.badoo.binder.Connection
 import com.badoo.mvicore.plugin.model.ConnectionData
 import java.lang.ref.PhantomReference
 import java.lang.ref.ReferenceQueue

diff --git a/mvicore/build.gradle b/mvicore/build.gradle
@@ -8,6 +8,7 @@ group = 'com.github.badoo.mvicore'
 dependencies {
     def deps = rootProject.ext.deps
 
+    api project(":binder")
     implementation deps('io.reactivex.rxjava2:rxjava')
     implementation deps('io.reactivex.rxjava2:rxkotlin')
     implementation deps("org.jetbrains.kotlin:kotlin-stdlib-jdk7")

diff --git a/mvicore/src/main/java/com/badoo/mvicore/binder/Binder.kt b/mvicore/src/main/java/com/badoo/mvicore/binder/Binder.kt
diff --git a/mvicore/src/main/java/com/badoo/mvicore/binder/Connection.kt b/mvicore/src/main/java/com/badoo/mvicore/binder/Connection.kt
diff --git a/mvicore/src/main/java/com/badoo/mvicore/binder/lifecycle/Lifecycle.kt b/mvicore/src/main/java/com/badoo/mvicore/binder/lifecycle/Lifecycle.kt
diff --git a/mvicore/src/main/java/com/badoo/mvicore/binder/lifecycle/ManualLifecycle.kt b/mvicore/src/main/java/com/badoo/mvicore/binder/lifecycle/ManualLifecycle.kt
diff --git a/mvicore/src/main/java/com/badoo/mvicore/binder/lifecycle/internal/FromObservableSource.kt b/mvicore/src/main/java/com/badoo/mvicore/binder/lifecycle/internal/FromObservableSource.kt
diff --git a/mvicore/src/main/java/com/badoo/mvicore/connector/Connector.kt b/mvicore/src/main/java/com/badoo/mvicore/connector/Connector.kt