work on RxKotlin 3: target RxJava 3

vpriscan · vpriscan · commit b34d19e4c546 · 2020-01-31T23:49:58.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,7 +39,7 @@ val examplesImplementation by configurations.getting {
 }
 
 dependencies {
-    api("io.reactivex.rxjava2:rxjava:2.2.10")
+    api("io.reactivex.rxjava3:rxjava:3.0.0-RC9")
     implementation(kotlin("stdlib"))
 
     testImplementation("org.funktionale:funktionale-partials:1.0.0-final")
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/Flowables.kt b/src/main/kotlin/io/reactivex/rxkotlin/Flowables.kt
@@ -2,14 +2,14 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.FlowableEmitter
-import io.reactivex.annotations.BackpressureKind
-import io.reactivex.annotations.BackpressureSupport
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.functions.*
+import io.reactivex.rxjava3.annotations.BackpressureKind
+import io.reactivex.rxjava3.annotations.BackpressureSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableEmitter
+import io.reactivex.rxjava3.functions.*
 import org.reactivestreams.Publisher
 
 
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/Maybes.kt b/src/main/kotlin/io/reactivex/rxkotlin/Maybes.kt
@@ -2,11 +2,11 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Maybe
-import io.reactivex.MaybeSource
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.functions.*
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.MaybeSource
+import io.reactivex.rxjava3.functions.*
 
 object Maybes {
     @CheckReturnValue
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/Observables.kt b/src/main/kotlin/io/reactivex/rxkotlin/Observables.kt
@@ -2,11 +2,11 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Observable
-import io.reactivex.ObservableSource
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.functions.*
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.*
 
 /**
  * SAM adapters to aid Kotlin lambda support
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/Singles.kt b/src/main/kotlin/io/reactivex/rxkotlin/Singles.kt
@@ -1,10 +1,10 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Single
-import io.reactivex.SingleSource
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.functions.*
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.core.SingleSource
+import io.reactivex.rxjava3.functions.*
 
 
 object Singles {
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/completable.kt b/src/main/kotlin/io/reactivex/rxkotlin/completable.kt
@@ -2,15 +2,15 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Completable
-import io.reactivex.CompletableSource
-import io.reactivex.Flowable
-import io.reactivex.Observable
-import io.reactivex.annotations.BackpressureKind
-import io.reactivex.annotations.BackpressureSupport
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.functions.Action
+import io.reactivex.rxjava3.annotations.BackpressureKind
+import io.reactivex.rxjava3.annotations.BackpressureSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.CompletableSource
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.functions.Action
 import java.util.concurrent.Callable
 import java.util.concurrent.Future
 
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/disposable.kt b/src/main/kotlin/io/reactivex/rxkotlin/disposable.kt
@@ -1,7 +1,7 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
 
 /**
  * disposable += observable.subscribe()
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/flowable.kt b/src/main/kotlin/io/reactivex/rxkotlin/flowable.kt
@@ -2,14 +2,13 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Flowable
-import io.reactivex.Single
-import io.reactivex.annotations.BackpressureKind
-import io.reactivex.annotations.BackpressureSupport
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Function3
+import io.reactivex.rxjava3.annotations.BackpressureKind
+import io.reactivex.rxjava3.annotations.BackpressureSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.functions.*
 import org.reactivestreams.Publisher
 
 
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/maybe.kt b/src/main/kotlin/io/reactivex/rxkotlin/maybe.kt
@@ -2,14 +2,14 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.MaybeSource
-import io.reactivex.Observable
-import io.reactivex.annotations.BackpressureKind
-import io.reactivex.annotations.BackpressureSupport
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
+import io.reactivex.rxjava3.annotations.BackpressureKind
+import io.reactivex.rxjava3.annotations.BackpressureSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.MaybeSource
+import io.reactivex.rxjava3.core.Observable
 
 
 @CheckReturnValue
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/observable.kt b/src/main/kotlin/io/reactivex/rxkotlin/observable.kt
@@ -2,11 +2,11 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Observable
-import io.reactivex.ObservableSource
-import io.reactivex.Single
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.core.Single
 
 
 @CheckReturnValue
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/single.kt b/src/main/kotlin/io/reactivex/rxkotlin/single.kt
@@ -2,14 +2,14 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Flowable
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.SingleSource
-import io.reactivex.annotations.BackpressureKind
-import io.reactivex.annotations.BackpressureSupport
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
+import io.reactivex.rxjava3.annotations.BackpressureKind
+import io.reactivex.rxjava3.annotations.BackpressureSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.core.SingleSource
 
 inline fun <reified R : Any> Single<*>.cast(): Single<R> = cast(R::class.java)
 
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/subscribers.kt b/src/main/kotlin/io/reactivex/rxkotlin/subscribers.kt
@@ -1,14 +1,15 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.*
-import io.reactivex.annotations.BackpressureKind
-import io.reactivex.annotations.BackpressureSupport
-import io.reactivex.annotations.CheckReturnValue
-import io.reactivex.annotations.SchedulerSupport
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Action
-import io.reactivex.functions.Consumer
-import io.reactivex.internal.functions.Functions
+import io.reactivex.rxjava3.annotations.BackpressureKind
+import io.reactivex.rxjava3.annotations.BackpressureSupport
+import io.reactivex.rxjava3.annotations.CheckReturnValue
+import io.reactivex.rxjava3.annotations.SchedulerSupport
+import io.reactivex.rxjava3.core.*
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.internal.functions.Functions
+
 
 private val onNextStub: (Any) -> Unit = {}
 private val onErrorStub: (Throwable) -> Unit = {}
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/BasicKotlinTests.kt b/src/test/kotlin/io/reactivex/rxkotlin/BasicKotlinTests.kt
@@ -16,11 +16,10 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.*
-import io.reactivex.exceptions.OnErrorNotImplementedException
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Function3
-import io.reactivex.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.core.*
+import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException
+import io.reactivex.rxjava3.functions.*
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import org.junit.Assert.*
 import org.junit.Test
 import org.mockito.Mockito.*
@@ -141,8 +140,8 @@ class BasicKotlinTests : KotlinTests() {
     @Test fun testStartWith() {
         val list = listOf(10, 11, 12, 13, 14)
         val startList = listOf(1, 2, 3, 4, 5)
-        assertEquals(6, Observable.fromIterable(list).startWith(0).count().blockingGet())
-        assertEquals(10, Observable.fromIterable(list).startWith(startList).count().blockingGet())
+        assertEquals(6, Observable.fromIterable(list).startWithItem(0).count().blockingGet())
+        assertEquals(10, Observable.fromIterable(list).startWithIterable(startList).count().blockingGet())
     }
 
     @Test fun testScriptWithOnNext() {
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/CompletableTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/CompletableTest.kt
@@ -1,9 +1,9 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Completable
-import io.reactivex.Single
-import io.reactivex.functions.Action
-import io.reactivex.observers.LambdaConsumerIntrospection
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.functions.Action
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/ExtensionTests.kt b/src/test/kotlin/io/reactivex/rxkotlin/ExtensionTests.kt
@@ -16,11 +16,11 @@
 
 package io.reactivex.rxkotlin
 
-import io.reactivex.Notification
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
-import io.reactivex.functions.Function3
-import io.reactivex.schedulers.TestScheduler
+import io.reactivex.rxjava3.core.Notification
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.ObservableEmitter
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.functions.*
 import org.funktionale.partials.invoke
 import org.junit.Assert.assertEquals
 import org.junit.Assert.fail
@@ -111,8 +111,8 @@ class ExtensionTests : KotlinTests() {
     @Test fun testStartWith() {
         val list = listOf(10, 11, 12, 13, 14)
         val startList = listOf(1, 2, 3, 4, 5)
-        assertEquals(6, list.toObservable().startWith(0).count().blockingGet())
-        assertEquals(10, list.toObservable().startWith(startList).count().blockingGet())
+        assertEquals(6, list.toObservable().startWithItem(0).count().blockingGet())
+        assertEquals(10, list.toObservable().startWithIterable(startList).count().blockingGet())
     }
 
     @Test fun testScriptWithOnNext() {
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/FlowableTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/FlowableTest.kt
@@ -1,11 +1,10 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.Flowable.create
-import io.reactivex.FlowableEmitter
-import io.reactivex.observers.LambdaConsumerIntrospection
-import io.reactivex.subscribers.TestSubscriber
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableEmitter
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
+import io.reactivex.rxjava3.subscribers.TestSubscriber
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -17,7 +16,7 @@ import java.util.concurrent.atomic.AtomicReference
 class FlowableTest {
 
     private fun <T : Any> bufferedFlowable(source: (FlowableEmitter<T>) -> Unit) =
-            create(source, BackpressureStrategy.BUFFER)
+            Flowable.create(source, BackpressureStrategy.BUFFER)
 
     @org.junit.Test fun testCreation() {
         val o0: Flowable<Int> = Flowable.empty()
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/MaybeTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/MaybeTest.kt
@@ -1,8 +1,8 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Maybe
-import io.reactivex.Single
-import io.reactivex.observers.LambdaConsumerIntrospection
+import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
 import org.junit.Assert
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicReference
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/ObservableTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/ObservableTest.kt
@@ -1,8 +1,8 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Observable
-import io.reactivex.observers.LambdaConsumerIntrospection
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.Assert
 import org.junit.Assert.*
 import org.junit.Ignore
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/ObservablesTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/ObservablesTest.kt
@@ -1,6 +1,6 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/SingleTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/SingleTest.kt
@@ -1,7 +1,7 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Single
-import io.reactivex.observers.LambdaConsumerIntrospection
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
 import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mockito
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/SinglesTest.kt b/src/test/kotlin/io/reactivex/rxkotlin/SinglesTest.kt
@@ -1,7 +1,7 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Single
-import io.reactivex.SingleSource
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.core.SingleSource
 import org.junit.Test
 
 class SinglesTest : KotlinTests() {
diff --git a/src/test/kotlin/io/reactivex/rxkotlin/SubscriptionTests.kt b/src/test/kotlin/io/reactivex/rxkotlin/SubscriptionTests.kt
@@ -1,7 +1,7 @@
 package io.reactivex.rxkotlin
 
-import io.reactivex.Observable
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.junit.Test
 import java.util.concurrent.TimeUnit
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ val examplesImplementation by configurations.getting {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`dependencies {`
`42`		`- api("io.reactivex.rxjava2:rxjava:2.2.10")`
	`42`	`+ api("io.reactivex.rxjava3:rxjava:3.0.0-RC9")`
`43`	`43`	`implementation(kotlin("stdlib"))`
`44`	`44`
`45`	`45`	`testImplementation("org.funktionale:funktionale-partials:1.0.0-final")`