work on RxKotlin 3: change RxKotlin package and maven coordinates, update examples

vpriscan · vpriscan · commit 213e698149a8 · 2020-02-01T16:38:43.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ repositories {
     jcenter()
 }
 
-group = "io.reactivex.rxjava2"
+group = "io.reactivex.rxjava3"
 
 //additional source sets
 sourceSets {
@@ -46,9 +46,9 @@ dependencies {
     testImplementation("junit:junit:4.12")
     testImplementation("org.mockito:mockito-core:1.10.19")
 
-    examplesImplementation("com.squareup.retrofit2:retrofit:2.6.0")
-    examplesImplementation("com.squareup.retrofit2:adapter-rxjava2:2.6.0")
-    examplesImplementation("com.squareup.retrofit2:converter-moshi:2.6.0")
+    examplesImplementation("com.squareup.retrofit2:retrofit:2.7.1")
+    examplesImplementation("com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0-RC8")
+    examplesImplementation("com.squareup.retrofit2:converter-moshi:2.7.1")
 }
 
 //sources
diff --git a/src/examples/kotlin/io/reactivex/rxkotlin3/examples/examples.kt b/src/examples/kotlin/io/reactivex/rxkotlin3/examples/examples.kt
@@ -1,8 +1,8 @@
-package io.reactivex.rxkotlin.examples
+package io.reactivex.rxkotlin3.examples
 
-import io.reactivex.Observable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.*
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxkotlin3.*
 import java.net.URL
 import java.util.*
 import java.util.concurrent.TimeUnit
diff --git a/src/examples/kotlin/io/reactivex/rxkotlin3/examples/retrofit/retrofit.kt b/src/examples/kotlin/io/reactivex/rxkotlin3/examples/retrofit/retrofit.kt
@@ -1,8 +1,8 @@
-package io.reactivex.rxkotlin.examples.retrofit
+package io.reactivex.rxkotlin3.examples.retrofit
 
-import io.reactivex.Observable
+import hu.akarnokd.rxjava3.retrofit.RxJava3CallAdapterFactory
+import io.reactivex.rxjava3.core.Observable
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Query
@@ -19,7 +19,7 @@ interface MavenSearchService {
 fun main(args: Array<String>) {
     val service = Retrofit.Builder().
             baseUrl("http://search.maven.org").
-            addCallAdapterFactory(RxJava2CallAdapterFactory.create()).
+            addCallAdapterFactory(RxJava3CallAdapterFactory.create()).
             addConverterFactory(MoshiConverterFactory.create()).
             build().
             create(MavenSearchService::class.java)
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/Flowables.kt b/src/main/kotlin/io/reactivex/rxkotlin3/Flowables.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.BackpressureKind
 import io.reactivex.rxjava3.annotations.BackpressureSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/Maybes.kt b/src/main/kotlin/io/reactivex/rxkotlin3/Maybes.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.CheckReturnValue
 import io.reactivex.rxjava3.annotations.SchedulerSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/Observables.kt b/src/main/kotlin/io/reactivex/rxkotlin3/Observables.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused", "HasPlatformType")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.CheckReturnValue
 import io.reactivex.rxjava3.annotations.SchedulerSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/Singles.kt b/src/main/kotlin/io/reactivex/rxkotlin3/Singles.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.CheckReturnValue
 import io.reactivex.rxjava3.annotations.SchedulerSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/completable.kt b/src/main/kotlin/io/reactivex/rxkotlin3/completable.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HasPlatformType", "unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.BackpressureKind
 import io.reactivex.rxjava3.annotations.BackpressureSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/disposable.kt b/src/main/kotlin/io/reactivex/rxkotlin3/disposable.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.disposables.Disposable
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/flowable.kt b/src/main/kotlin/io/reactivex/rxkotlin3/flowable.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HasPlatformType", "unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.BackpressureKind
 import io.reactivex.rxjava3.annotations.BackpressureSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/maybe.kt b/src/main/kotlin/io/reactivex/rxkotlin3/maybe.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HasPlatformType", "unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.BackpressureKind
 import io.reactivex.rxjava3.annotations.BackpressureSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/observable.kt b/src/main/kotlin/io/reactivex/rxkotlin3/observable.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HasPlatformType", "unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.CheckReturnValue
 import io.reactivex.rxjava3.annotations.SchedulerSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/single.kt b/src/main/kotlin/io/reactivex/rxkotlin3/single.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HasPlatformType", "unused")
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.BackpressureKind
 import io.reactivex.rxjava3.annotations.BackpressureSupport
diff --git a/src/main/kotlin/io/reactivex/rxkotlin3/subscribers.kt b/src/main/kotlin/io/reactivex/rxkotlin3/subscribers.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.annotations.BackpressureKind
 import io.reactivex.rxjava3.annotations.BackpressureSupport
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/BasicKotlinTests.kt b/src/test/kotlin/io/reactivex/rxkotlin3/BasicKotlinTests.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.*
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/CompletableTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/CompletableTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/ExtensionTests.kt b/src/test/kotlin/io/reactivex/rxkotlin3/ExtensionTests.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Notification
 import io.reactivex.rxjava3.core.Observable
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/FlowableTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/FlowableTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/KotlinTests.kt b/src/test/kotlin/io/reactivex/rxkotlin3/KotlinTests.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import org.junit.Before
 import org.mockito.Mock
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/MaybeTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/MaybeTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.core.Single
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/ObservableTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/ObservableTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/ObservablesTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/ObservablesTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Observable
 import org.junit.Assert.assertEquals
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/SingleTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/SingleTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/SinglesTest.kt b/src/test/kotlin/io/reactivex/rxkotlin3/SinglesTest.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.core.SingleSource
diff --git a/src/test/kotlin/io/reactivex/rxkotlin3/SubscriptionTests.kt b/src/test/kotlin/io/reactivex/rxkotlin3/SubscriptionTests.kt
@@ -1,4 +1,4 @@
-package io.reactivex.rxkotlin
+package io.reactivex.rxkotlin3
 
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.CompositeDisposable

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.reactivex.rxkotlin`
	`1`	`+package io.reactivex.rxkotlin3`
`2`	`2`
`3`	`3`	`import io.reactivex.rxjava3.annotations.CheckReturnValue`
`4`	`4`	`import io.reactivex.rxjava3.annotations.SchedulerSupport`