Skip to content
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

Jump to bottom

Migration to RxJava3 #29

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Migration to RxJava3 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
232d093
Depend on RxJava3
KeithYokoma Feb 18, 2020
887f8e6
Replace packages with the new ones
KeithYokoma Feb 18, 2020
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
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object MavenUrl {
object Version {
const val bintray = "1.8.4"
const val kotlin = "1.3.30"
const val rxJava = "2.2.9"
const val rxJava = "3.0.0"
const val kluent = "1.49"
const val spek = "2.0.2"
const val jacoco = "0.8.4"
Expand All @@ -23,7 +23,7 @@ object Classpath {

object Dependencies {
const val kotlin = "stdlib"
const val rxJava = "io.reactivex.rxjava2:rxjava:${Version.rxJava}"
const val rxJava = "io.reactivex.rxjava3:rxjava:${Version.rxJava}"
}

object TestDependencies {
Expand Down
20 changes: 10 additions & 10 deletions rxredux/src/main/java/com/mercari/rxredux/RxRedux.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.mercari.rxredux

import io.reactivex.Observable
import io.reactivex.Scheduler
import io.reactivex.annotations.CheckReturnValue
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import io.reactivex.subjects.PublishSubject
import io.reactivex.rxjava3.annotations.CheckReturnValue
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.core.Scheduler
import io.reactivex.rxjava3.disposables.Disposable
import io.reactivex.rxjava3.schedulers.Schedulers
import io.reactivex.rxjava3.subjects.PublishSubject

interface Action

Expand Down Expand Up @@ -43,10 +43,10 @@ interface StoreType<S : State, A : Action> {
}

class Store<S : State, A : Action>(
initialState: S,
reducer: Reducer<S, A>,
defaultScheduler: Scheduler = Schedulers.single(),
serializeActions: Boolean = false
initialState: S,
reducer: Reducer<S, A>,
defaultScheduler: Scheduler = Schedulers.single(),
serializeActions: Boolean = false
) : StoreType<S, A> {

// seed action
Expand Down
2 changes: 1 addition & 1 deletion rxredux/src/test/java/com/mercari/rxredux/MultiThreadTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.mercari.rxredux

import io.reactivex.Observable
import io.reactivex.rxjava3.core.Observable
import org.amshove.kluent.shouldBeGreaterThan
import org.amshove.kluent.shouldEqual
import org.spekframework.spek2.Spek
Expand Down
14 changes: 9 additions & 5 deletions rxredux/src/test/java/com/mercari/rxredux/RxReduxTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.mercari.rxredux

import io.reactivex.Observable
import io.reactivex.schedulers.Schedulers
import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.schedulers.Schedulers
import org.amshove.kluent.shouldBeInstanceOf
import org.amshove.kluent.shouldBeTrue
import org.amshove.kluent.shouldEqual
Expand Down Expand Up @@ -94,7 +98,7 @@ class ReduxTest : Spek({
val obs = Observable.just(Decrement(23))
store.dispatch(obs)

val lastIndex = test.valueCount() - 1
val lastIndex = test.values().size - 1
test.assertValueAt(lastIndex) { (it.counter == -22).shouldBeTrue() }
}

Expand All @@ -105,7 +109,7 @@ class ReduxTest : Spek({

store.dispatch(ob1, ob2, ob3)

val lastIndex = test.valueCount() - 1
val lastIndex = test.values().size - 1
test.values()[lastIndex].counter shouldEqual -19
}

Expand Down Expand Up @@ -145,7 +149,7 @@ class ReduxTest : Spek({

localSubscriber.assertValueCount(4)

localSubscriber.cancel()
localSubscriber.dispose()

store.dispatch(Increment(2))
store.dispatch(Decrement(3))
Expand Down