Update to RxJava 3

app/build.gradle

@@ -31,15 +31,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':rxbilling')
+    implementation project(':rxbilling3')
 
     implementation kotlinDependencies.kotlinStdLib
     implementation dataDependencies.billingClient
     implementation presentationDependencies.lifecycleExtensions
     kapt presentationDependencies.lifecycleCompiler
     implementation developmentDependencies.timber
-    implementation dataDependencies.rxJava
-    implementation dataDependencies.rxAndroid
+    implementation dataDependencies.rxJava3
+    implementation dataDependencies.rxAndroid3
     implementation presentationDependencies.appCompat
 
     testImplementation testDependencies.jUnit

app/src/main/java/com/gen/rxbilling/sample/MainActivity.kt

@@ -3,11 +3,11 @@ package com.gen.rxbilling.sample
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.android.billingclient.api.*
-import com.gen.rxbilling.client.RxBilling
-import com.gen.rxbilling.client.RxBillingImpl
-import com.gen.rxbilling.connection.BillingClientFactory
-import com.gen.rxbilling.lifecycle.BillingConnectionManager
-import io.reactivex.disposables.CompositeDisposable
+import com.gen.rxbilling3.client.RxBilling
+import com.gen.rxbilling3.client.RxBillingImpl
+import com.gen.rxbilling3.connection.BillingClientFactory
+import com.gen.rxbilling3.lifecycle.BillingConnectionManager
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.activity_main.*
 import timber.log.Timber
 

dependencies.gradle

@@ -4,7 +4,7 @@ ext {
     targetSdkVer = 28
 
     versionCode = 1
-    versionName = '3.0.0'
+    versionName = '4.0.0'
 
     // Kotlin
     kotlinVer = '1.4.10'
@@ -23,8 +23,8 @@ ext {
     xExtVer = '1.1.2'
 
     // Reactive Extensions
-    rxJava2Ver = '2.2.20'
-    rxAndroid2Ver = '2.1.1'
+    rxJava3Ver = '3.1.0'
+    rxAndroid3Ver = '3.0.0'
 
     // Billing Client
     billingClientVer = '3.0.1'
@@ -60,8 +60,8 @@ ext {
     ]
 
     dataDependencies = [
-            rxJava       : "io.reactivex.rxjava2:rxjava:$rxJava2Ver",
-            rxAndroid    : "io.reactivex.rxjava2:rxandroid:$rxAndroid2Ver",
+            rxJava3      : "io.reactivex.rxjava3:rxjava:$rxJava3Ver",
+            rxAndroid3   : "io.reactivex.rxjava3:rxandroid:$rxAndroid3Ver",
             billingClient: "com.android.billingclient:billing:$billingClientVer"
     ]
 

rxbilling3/.gitignore

@@ -0,0 +1 @@
+/build

rxbilling/build.gradle → rxbilling3/build.gradle

@@ -7,13 +7,12 @@ apply plugin: 'org.jetbrains.dokka-android'
 android {
 
     defaultConfig {
-        versionName "3.0.0"
+        versionName "4.0.0"
         minSdkVersion minSdkVer
         targetSdkVersion targetSdkVer
         compileSdkVersion compileSdkVer
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -36,11 +35,10 @@ dokka {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation developmentDependencies.timber
-    implementation dataDependencies.rxJava
-    implementation dataDependencies.rxAndroid
+    implementation dataDependencies.rxJava3
+    implementation dataDependencies.rxAndroid3
     implementation dataDependencies.billingClient
     implementation kotlinDependencies.kotlinStdLib
 
@@ -53,7 +51,6 @@ dependencies {
     testImplementation testDependencies.jUnit
     testImplementation testDependencies.mockito
     testImplementation testDependencies.mockitoKotlin
-
 }
 
 task sourcesJar(type: Jar) {
@@ -79,6 +76,3 @@ artifacts {
     archives javadocJar
     archives sourcesJar
 }
-
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())

rxbilling3/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.gen.rxbilling3" />

rxbilling/src/main/java/com/gen/rxbilling/client/PurchasesUpdate.kt → rxbilling3/src/main/java/com/gen/rxbilling3/client/PurchasesUpdate.kt

@@ -1,4 +1,4 @@
-package com.gen.rxbilling.client
+package com.gen.rxbilling3.client
 
 import com.android.billingclient.api.Purchase
 

rxbilling/src/main/java/com/gen/rxbilling/client/RxBilling.kt → rxbilling3/src/main/java/com/gen/rxbilling3/client/RxBilling.kt

@@ -1,17 +1,17 @@
-package com.gen.rxbilling.client
+package com.gen.rxbilling3.client
 
 import android.app.Activity
 import com.android.billingclient.api.*
 import com.android.billingclient.api.BillingClient.FeatureType
-import com.gen.rxbilling.connection.BillingClientFactory
-import com.gen.rxbilling.exception.BillingException
-import com.gen.rxbilling.lifecycle.Connectable
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.subjects.PublishSubject
+import com.gen.rxbilling3.connection.BillingClientFactory
+import com.gen.rxbilling3.exception.BillingException
+import com.gen.rxbilling3.lifecycle.Connectable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.subjects.PublishSubject
 
 interface RxBilling : Connectable<BillingClient> {
 

rxbilling/src/main/java/com/gen/rxbilling/connection/BillingClientFactory.kt → rxbilling3/src/main/java/com/gen/rxbilling3/connection/BillingClientFactory.kt

@@ -1,14 +1,14 @@
-package com.gen.rxbilling.connection
+package com.gen.rxbilling3.connection
 
 import android.content.Context
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClientStateListener
 import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.PurchasesUpdatedListener
-import com.gen.rxbilling.exception.BillingException
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.FlowableTransformer
+import com.gen.rxbilling3.exception.BillingException
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableTransformer
 import timber.log.Timber
 
 class BillingClientFactory(

rxbilling/src/main/java/com/gen/rxbilling/connection/RepeatConnectionTransformer.kt → rxbilling3/src/main/java/com/gen/rxbilling3/connection/RepeatConnectionTransformer.kt

@@ -1,7 +1,7 @@
-package com.gen.rxbilling.connection
+package com.gen.rxbilling3.connection
 
-import io.reactivex.Flowable
-import io.reactivex.FlowableTransformer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.FlowableTransformer
 import org.reactivestreams.Publisher
 
 class RepeatConnectionTransformer<T> : FlowableTransformer<T, T> {

rxbilling/src/main/java/com/gen/rxbilling/exception/BillingException.kt → rxbilling3/src/main/java/com/gen/rxbilling3/exception/BillingException.kt

@@ -1,4 +1,4 @@
-package com.gen.rxbilling.exception
+package com.gen.rxbilling3.exception
 
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingResult

rxbilling/src/main/java/com/gen/rxbilling/lifecycle/BillingConnectionManager.kt → rxbilling3/src/main/java/com/gen/rxbilling3/lifecycle/BillingConnectionManager.kt

@@ -1,9 +1,9 @@
-package com.gen.rxbilling.lifecycle
+package com.gen.rxbilling3.lifecycle
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import timber.log.Timber
 
 class BillingConnectionManager<T>(

rxbilling3/src/main/java/com/gen/rxbilling3/lifecycle/Connectable.kt

@@ -0,0 +1,8 @@
+package com.gen.rxbilling3.lifecycle
+
+import io.reactivex.rxjava3.core.Flowable
+
+interface Connectable<T> {
+
+    fun connect() : Flowable<T>
+}

rxbilling3/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Rx Billing3</string>
+</resources>

rxbilling/src/test/java/com/gen/rxbilling/RepeatConnectionTransformerTest.kt → rxbilling3/src/test/java/com/gen/rxbilling3/RepeatConnectionTransformerTest.kt

@@ -1,9 +1,9 @@
-package com.gen.rxbilling
+package com.gen.rxbilling3
 
-import com.gen.rxbilling.connection.RepeatConnectionTransformer
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.schedulers.TestScheduler
+import com.gen.rxbilling3.connection.RepeatConnectionTransformer
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.schedulers.TestScheduler
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
@@ -82,7 +82,7 @@ class RepeatConnectionTransformerTest {
                 }, BackpressureStrategy.LATEST))
                 .compose(RepeatConnectionTransformer<Int>())
         val subscriber = flowable.test()
-        subscriber.dispose()
+        subscriber.cancel()
         subscriber.assertValueSequence(listOf(1))
         subscriber.assertNotComplete()
         assertTrue(cancelCalled)

settings.gradle

@@ -1 +1,2 @@
-include ':app', ':rxbilling'
+include ':app'
+include ':rxbilling3'