Skip to content

migration to rxJava3 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joanb wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

migration to rxJava3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mvicore21/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ targetCompatibility = "8"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation "io.reactivex.rxjava2:rxjava:2.2.12"
implementation "io.reactivex.rxjava3:rxjava:3.0.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.60"

testImplementation "junit:junit:4.12"
Expand Down
8 changes: 4 additions & 4 deletions mvicore21/src/main/java/com/b21/mvicore21/BaseFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.b21.mvicore21

import io.reactivex.BackpressureStrategy
import io.reactivex.Flowable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.reactivex.rxjava3.core.BackpressureStrategy
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.subjects.PublishSubject
import io.reactivex.rxjava3.subjects.Subject
import org.reactivestreams.Subscriber

typealias WishToAction<Wish, State, Action> = (Wish, State) -> Action?
Expand Down
4 changes: 2 additions & 2 deletions mvicore21/src/main/java/com/b21/mvicore21/Feature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.b21.mvicore21

import io.reactivex.Flowable
import io.reactivex.functions.Consumer
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.functions.Consumer

abstract class Feature<State : Any, Wish : Any, News : Any> : Flowable<State>(), Consumer<Wish> {
abstract var state: State
Expand Down
7 changes: 4 additions & 3 deletions sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
implementation "io.reactivex.rxjava2:rxjava:2.2.12"
implementation "com.jakewharton.rxbinding3:rxbinding-core:3.0.0"
implementation "com.jakewharton.rxrelay2:rxrelay:2.1.1"
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'

implementation "io.reactivex.rxjava3:rxjava:3.0.0"
implementation "com.jakewharton.rxbinding3:rxbinding-core:3.1.0"
implementation "com.jakewharton.rxrelay2:rxrelay:2.1.1"
testImplementation 'junit:junit:4.12'
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/java/com/b21/mvi/loaddata/NumbersActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView
import com.b21.mvi.R
import com.jakewharton.rxrelay2.PublishRelay
import com.jakewharton.rxrelay2.Relay
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Observable

class NumbersActivity : AppCompatActivity(), NumbersView {

Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/java/com/b21/mvi/loaddata/NumbersActor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.b21.mvi.loaddata

import com.b21.mvicore21.Actor
import io.reactivex.Flowable
import io.reactivex.Scheduler
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Scheduler

class NumbersActor(
private val useCase: NumbersUseCase,
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/java/com/b21/mvi/loaddata/NumbersFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.b21.mvi.loaddata

import com.b21.mvicore21.BaseFeature
import io.reactivex.Scheduler
import io.reactivex.rxjava3.core.Scheduler

open class NumbersFeature(
useCase: NumbersUseCase,
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/java/com/b21/mvi/loaddata/NumbersPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.b21.mvi.loaddata

import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxjava3.disposables.CompositeDisposable

class NumbersPresenter(
private val view: NumbersView,
Expand Down
3 changes: 2 additions & 1 deletion sample/src/main/java/com/b21/mvi/loaddata/NumbersView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.b21.mvi.loaddata

import io.reactivex.Observable
import io.reactivex.rxjava3.core.Observable


interface NumbersView {
val userIntents: Observable<UserIntent>
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/java/com/b21/mvi/sum/CounterActor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.b21.mvi.sum

import com.b21.mvicore21.Actor
import io.reactivex.Flowable
import io.reactivex.Scheduler
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Scheduler

class CounterActor(
private val main: Scheduler
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/java/com/b21/mvi/sum/CounterFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.b21.mvi.sum

import com.b21.mvicore21.BaseFeature
import io.reactivex.Scheduler
import io.reactivex.rxjava3.core.Scheduler

open class CounterFeature(
bootstrapperAction: CounterAction? = null,
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/java/com/b21/mvi/sum/CounterPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.b21.mvi.sum

import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxjava3.disposables.CompositeDisposable

class CounterPresenter(
private val view: CounterView,
Expand Down
3 changes: 2 additions & 1 deletion sample/src/main/java/com/b21/mvi/sum/CounterView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.b21.mvi.sum

import io.reactivex.Observable
import io.reactivex.rxjava3.core.Observable


interface CounterView {
val userIntents: Observable<UserIntent>
Expand Down