Update gradle and Deprecate EventBus

Author: skyfe79

app/src/main/java/com/github/skyfe79/android/library/app/MainViewLayout.kt

@@ -4,7 +4,7 @@ import android.view.View
 import com.github.skyfe79.android.library.app.action.*
 import com.github.skyfe79.android.reactcomponentkit.component.LayoutComponent
 import com.github.skyfe79.android.reactcomponentkit.dispatcher.dispatch
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import kotlinx.android.synthetic.main.activity_main.view.*
 import org.jetbrains.anko.AnkoContext

app/src/main/java/com/github/skyfe79/android/library/app/examples/counter/CounterLayout.kt

@@ -11,12 +11,11 @@ import com.github.skyfe79.android.library.app.examples.counter.action.DecreaseAc
 import com.github.skyfe79.android.library.app.examples.counter.action.IncreaseAction
 import com.github.skyfe79.android.reactcomponentkit.component.LayoutComponent
 import com.github.skyfe79.android.reactcomponentkit.dispatcher.dispatch
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.Async
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import com.github.skyfe79.android.reactcomponentkit.subscriber.subscribeState
 import org.jetbrains.anko.*
-import org.jetbrains.anko.sdk27.coroutines.onClick
 
 class CounterLayout(token: Token): LayoutComponent<CounterActivity>(token) {
 

app/src/main/java/com/github/skyfe79/android/library/app/examples/counter2/CounterLayout2.kt

@@ -9,7 +9,7 @@ import com.github.skyfe79.android.library.app.examples.counter.action.DecreaseAc
 import com.github.skyfe79.android.library.app.examples.counter.action.IncreaseAction
 import com.github.skyfe79.android.reactcomponentkit.component.LayoutComponent
 import com.github.skyfe79.android.reactcomponentkit.dispatcher.dispatch
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import org.jetbrains.anko.*
 import org.jetbrains.anko.sdk27.coroutines.onClick

app/src/main/java/com/github/skyfe79/android/library/app/examples/emojicollection/components/EmojiViewComponent.kt

@@ -1,21 +1,16 @@
 package com.github.skyfe79.android.library.app.examples.emojicollection.components
 
 import android.content.Context
-import android.util.Log
 import android.view.Gravity.CENTER
 import android.view.View
 import android.widget.TextView
 import com.github.skyfe79.android.library.app.examples.emojicollection.models.EmojiProvider
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.ItemModel
 import com.github.skyfe79.android.reactcomponentkit.component.ViewComponent
 import com.github.skyfe79.android.reactcomponentkit.dispatcher.dispatch
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.Action
-import com.github.skyfe79.android.reactcomponentkit.redux.State
-import com.github.skyfe79.android.reactcomponentkit.subscriber.subscribeState
-import kotlinx.android.synthetic.main.activity_main.view.*
 import org.jetbrains.anko.*
-import org.jetbrains.anko.sdk27.coroutines.onClick
 
 data class ClickEmojiAction(val emoji: String): Action
 

app/src/main/java/com/github/skyfe79/android/library/app/examples/recyclerview/RecyclerActivity.kt

@@ -6,7 +6,7 @@ import com.github.skyfe79.android.library.app.R
 import com.github.skyfe79.android.library.app.examples.recyclerview.component.SectionViewComponent
 import com.github.skyfe79.android.library.app.examples.recyclerview.component.TextMessageViewComponent
 import com.github.skyfe79.android.library.app.examples.recyclerview.model.TextMessage
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.RecyclerViewAdapter
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.sticky.StickyHeadersLinearLayoutManager
 import kotlinx.android.synthetic.main.activity_recycler.*

app/src/main/java/com/github/skyfe79/android/library/app/examples/recyclerview/component/TextMessageViewComponent.kt

@@ -3,19 +3,16 @@ package com.github.skyfe79.android.library.app.examples.recyclerview.component
 import android.content.Context
 import android.view.Gravity
 import android.view.View
-import android.view.ViewGroup
 import android.widget.TextView
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import com.github.skyfe79.android.library.app.examples.recyclerview.model.BackgroundColorProvider
 import com.github.skyfe79.android.library.app.examples.recyclerview.model.TextMessageProvider
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.ItemModel
 import com.github.skyfe79.android.reactcomponentkit.component.ViewComponent
 import com.github.skyfe79.android.reactcomponentkit.component.component
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import org.jetbrains.anko.*
-import org.jetbrains.anko.coroutines.experimental.bg
 
 class TextMessageViewComponent(token: Token): ViewComponent(token) {
     lateinit var textView: TextView

reactcomponentkit/build.gradle

@@ -17,7 +17,7 @@ publish {
     userOrg = 'skyfe79'
     groupId = 'com.github.skyfe79.android'
     artifactId = 'reactcomponentkit'
-    publishVersion = '1.2.8'
+    publishVersion = '2.0.0'
     desc = 'AndroidReactComponentKit = Component + MVVM + Redux for Android!!!'
     website = 'https://github.com/ReactComponentKit/AndroidReactComponentKit'
 }
@@ -29,7 +29,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 11
+        versionCode 20
         versionName "2.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -59,8 +59,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.8"
-    implementation "io.reactivex.rxjava2:rxkotlin:2.3.0"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.10"
+    implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
     implementation 'com.jakewharton.rxrelay2:rxrelay:2.1.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
 

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/RCK.kt

@@ -1,6 +1,6 @@
 package com.github.skyfe79.android.reactcomponentkit
 
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.viewmodel.RCKViewModel
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import java.lang.ref.WeakReference

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/ReactComponent.kt

@@ -1,6 +1,6 @@
 package com.github.skyfe79.android.reactcomponentkit
 
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 
 interface StateSubscriber {

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/collectionview/CollectionViewAdapter.kt

@@ -6,7 +6,7 @@ import com.github.skyfe79.android.reactcomponentkit.collectionmodels.ItemModel
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.RecyclerViewHelper
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.SectionModel
 import com.github.skyfe79.android.reactcomponentkit.component.ViewComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.CollectionViewCellViewHolder
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.RecyclerViewCell
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.RecyclerViewCellViewHolder

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/collectionview/NestedCollectionViewComponent.kt

@@ -5,7 +5,7 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.github.skyfe79.android.reactcomponentkit.R
 import com.github.skyfe79.android.reactcomponentkit.component.ViewComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.RecyclerViewAdapter
 import org.jetbrains.anko.*
 import kotlin.reflect.KClass

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/FragmentComponent.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.github.skyfe79.android.reactcomponentkit.ReactComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 
 internal enum class FragmentComponentState {

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/IntentServiceComponent.kt

@@ -2,7 +2,7 @@ package com.github.skyfe79.android.reactcomponentkit.component
 
 import android.app.IntentService
 import com.github.skyfe79.android.reactcomponentkit.ReactComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 
 abstract class IntentServiceComponent(token: Token, name: String): IntentService(name), ReactComponent {

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/LayoutComponent.kt

@@ -1,7 +1,7 @@
 package com.github.skyfe79.android.reactcomponentkit.component
 
 import com.github.skyfe79.android.reactcomponentkit.ReactComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import org.jetbrains.anko.AnkoComponent
 

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/ServiceComponent.kt

@@ -2,7 +2,7 @@ package com.github.skyfe79.android.reactcomponentkit.component
 
 import android.app.Service
 import com.github.skyfe79.android.reactcomponentkit.ReactComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 
 abstract class ServiceComponent(token: Token): Service(), ReactComponent {
     override var token: Token = token

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/component/ViewComponent.kt

@@ -1,13 +1,12 @@
 package com.github.skyfe79.android.reactcomponentkit.component
 
 import android.content.Context
-import android.util.AttributeSet
 import android.view.View
 import android.view.ViewManager
 import com.github.skyfe79.android.reactcomponentkit.ReactComponent
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.ItemModel
 import com.github.skyfe79.android.reactcomponentkit.collectionview.SectionContent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 import org.jetbrains.anko.AnkoComponent
 import org.jetbrains.anko.AnkoContext

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/dispatcher/ActionDispatcher.kt

@@ -2,14 +2,16 @@ package com.github.skyfe79.android.reactcomponentkit.dispatcher
 
 import com.github.skyfe79.android.reactcomponentkit.eventbus.EventBus
 import com.github.skyfe79.android.reactcomponentkit.eventbus.EventType
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.Action
 import com.github.skyfe79.android.reactcomponentkit.redux.State
 
+@Deprecated("Do not use ComponentNewStateEvent. It will be removed on the next version")
 sealed class ComponentNewStateEvent: EventType {
     data class On(val state: State): ComponentNewStateEvent()
 }
 
+@Deprecated("Do not use ComponentDispatchEvent. It will be removed on the next version")
 sealed class ComponentDispatchEvent: EventType {
     data class Dispatch(val action: Action): ComponentDispatchEvent()
 }
@@ -18,6 +20,7 @@ sealed class ComponentDispatchEvent: EventType {
  * Dispatch actions where to has same token
  * It is used among components which has root view models.
  */
+@Deprecated("Do not use ActionDispatcher. It will be removed on the next version")
 class ActionDispatcher(private val token: Token) {
     private val dispatchEventBus = EventBus<ComponentDispatchEvent>(token)
 

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/eventbus/EventBus.kt

@@ -2,6 +2,7 @@
 
 package com.github.skyfe79.android.reactcomponentkit.eventbus
 
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.lang.Exception
@@ -17,6 +18,7 @@ internal data class Notification(val name: String, val sender: Any, val userInfo
  *  - empty: ignore eventbus
  *  - a valid token: post and receive events between eventbus which has same token
  */
+@Deprecated("Do not use EventBus. It will be removed on the next version")
 class EventBus<T: EventType>(val token: Token? = null) {
 
     private companion object {

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/recyclerview/RecyclerViewAdapter.kt

@@ -5,7 +5,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.ItemModel
 import com.github.skyfe79.android.reactcomponentkit.component.ViewComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import com.github.skyfe79.android.reactcomponentkit.recyclerview.sticky.StickyHeaders
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/recyclerview/RecyclerViewCell.kt

@@ -5,7 +5,7 @@ import android.view.ViewGroup
 import com.github.skyfe79.android.reactcomponentkit.collectionmodels.ItemModel
 import com.github.skyfe79.android.reactcomponentkit.collectionview.SectionContent
 import com.github.skyfe79.android.reactcomponentkit.component.ViewComponent
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
+import com.github.skyfe79.android.reactcomponentkit.viewmodel.Token
 import org.jetbrains.anko.AnkoContext
 
 

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/viewmodel/RCKViewModel.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import com.github.skyfe79.android.reactcomponentkit.RCK
 import com.github.skyfe79.android.reactcomponentkit.StateSubscriber
-import com.github.skyfe79.android.reactcomponentkit.eventbus.Token
 import com.github.skyfe79.android.reactcomponentkit.redux.*
 import com.github.skyfe79.android.reactcomponentkit.util.runOnUiThread
 import com.jakewharton.rxrelay2.BehaviorRelay
@@ -18,7 +17,8 @@ import java.lang.ref.WeakReference
 import java.util.concurrent.locks.ReentrantLock
 
 abstract class RCKViewModel<S: State>(application: Application): AndroidViewModel(application) {
-    val token: Token = Token()
+    val token: Token =
+        Token()
 
     private val rx_action: BehaviorRelay<Action> = BehaviorRelay.createDefault(
         VoidAction

reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/eventbus/Token.kt renamed to reactcomponentkit/src/main/java/com/github/skyfe79/android/reactcomponentkit/viewmodel/Token.kt

@@ -1,4 +1,4 @@
-package com.github.skyfe79.android.reactcomponentkit.eventbus
+package com.github.skyfe79.android.reactcomponentkit.viewmodel
 
 import android.os.Parcel
 import android.os.Parcelable
@@ -21,7 +21,8 @@ data class Token(val token: String = UUID.randomUUID().toString()) : Parcelable
 
         @JvmField
         val CREATOR: Parcelable.Creator<Token> = object : Parcelable.Creator<Token> {
-            override fun createFromParcel(source: Parcel): Token = Token(source)
+            override fun createFromParcel(source: Parcel): Token =
+                Token(source)
             override fun newArray(size: Int): Array<Token?> = arrayOfNulls(size)
         }
     }