Updated library to use RxJava 3 artifact. Fixed library errors.

Co-authored-by: Luca Weiss <luca@z3ntu.xyz>
z3ntu · Feb 15, 2021 · 8e5fbf1 · 8e5fbf1
1 parent 367ba39
commit 8e5fbf1
Show file tree

Hide file tree

Showing 94 changed files with 352 additions and 349 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,14 +1,14 @@
 ext {
-    rxJavaVersion = '2.2.17'
-    sourceCompatibilityVersion = JavaVersion.VERSION_1_7
-    targetCompatibilityVersion = JavaVersion.VERSION_1_7
+    rxJavaVersion = '3.0.10'
+    sourceCompatibilityVersion = JavaVersion.VERSION_1_8
+    targetCompatibilityVersion = JavaVersion.VERSION_1_8
     shadowPluginVersion = '5.0.0'
     daggerVersion = '2.15'
     libs = [
             /* Library-only dependencies */
-            rxjava                : "io.reactivex.rxjava2:rxjava:$rxJavaVersion",
+            rxjava                : "io.reactivex.rxjava3:rxjava:$rxJavaVersion",
             rxandroid             : 'io.reactivex.rxjava2:rxandroid:2.1.1',
-            rxrelay               : 'com.jakewharton.rxrelay2:rxrelay:2.1.1',
+            rxrelay               : 'com.jakewharton.rxrelay3:rxrelay:3.0.0',
             junit                 : 'junit:junit:4.13',
             groovy                : 'org.codehaus.groovy:groovy:2.5.8',
             spock                 : ['org.spockframework:spock-core:1.2-groovy-2.5',
@@ -21,8 +21,8 @@ ext {
             annotations           : "androidx.annotation:annotation:1.1.0",
             robolectric           : 'org.robolectric:robolectric:3.8',
             /* Sample apps-only dependencies */
-            rxjava_replayingshare : 'com.jakewharton.rx2:replaying-share:2.2.0',
-            rxjava_binding        : 'com.jakewharton.rxbinding3:rxbinding:3.1.0',
+            rxjava_replayingshare : 'com.jakewharton.rx3:replaying-share:3.0.0',
+            rxjava_binding        : 'com.jakewharton.rxbinding4:rxbinding:4.0.0',
             appcompat             : 'androidx.appcompat:appcompat:1.1.0',
             material_design       : 'com.google.android.material:material:1.0.0'
     ]

diff --git a/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java b/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java
@@ -24,9 +24,9 @@
 import java.util.Set;
 import java.util.UUID;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
 import io.reactivex.subjects.ReplaySubject;
 
 /**

diff --git a/...roidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMock.java b/...roidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMock.java
@@ -36,17 +36,17 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Single;
-import io.reactivex.SingleSource;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.core.SingleSource;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.subjects.CompletableSubject;
 import io.reactivex.subjects.SingleSubject;
 

diff --git a/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleDeviceMock.java b/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleDeviceMock.java
@@ -26,11 +26,11 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 import io.reactivex.subjects.ReplaySubject;
 
 import static com.polidea.rxandroidble2.RxBleConnection.RxBleConnectionState.CONNECTED;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/ClientComponent.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/ClientComponent.java
@@ -46,11 +46,11 @@
 import bleshadow.dagger.Provides;
 import bleshadow.javax.inject.Named;
 import bleshadow.javax.inject.Provider;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @ClientScope
 @Component(modules = {ClientComponent.ClientModule.class})

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleAdapterStateObservable.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleAdapterStateObservable.java
@@ -9,12 +9,12 @@
 
 import bleshadow.javax.inject.Inject;
 import com.polidea.rxandroidble2.internal.RxBleLog;
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.Observer;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Observes Bluetooth adapter state. This responds to user interactions as well as system controlled state changes.

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClient.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClient.java
@@ -13,7 +13,7 @@
 import java.util.Set;
 import java.util.UUID;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 public abstract class RxBleClient {

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClientImpl.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClientImpl.java
@@ -25,25 +25,25 @@
 import com.polidea.rxandroidble2.scan.ScanResult;
 import com.polidea.rxandroidble2.scan.ScanSettings;
 
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Supplier;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 
 import bleshadow.dagger.Lazy;
 import bleshadow.javax.inject.Inject;
 import bleshadow.javax.inject.Named;
-import io.reactivex.Maybe;
-import io.reactivex.MaybeSource;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Scheduler;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.core.MaybeSource;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
 
 class RxBleClientImpl extends RxBleClient {
 
@@ -124,9 +124,9 @@ public Set<RxBleDevice> getBondedDevices() {
 
     @Override
     public Observable<ScanResult> scanBleDevices(final ScanSettings scanSettings, final ScanFilter... scanFilters) {
-        return Observable.defer(new Callable<ObservableSource<? extends ScanResult>>() {
+        return Observable.defer(new Supplier<ObservableSource<? extends ScanResult>>() {
             @Override
-            public Observable<ScanResult> call() {
+            public Observable<ScanResult> get() {
                 scanPreconditionVerifier.verify(scanSettings.shouldCheckLocationProviderState());
                 final ScanSetup scanSetup = scanSetupBuilder.build(scanSettings, scanFilters);
                 final Operation<RxBleInternalScanResult> scanOperation = scanSetup.scanOperation;
@@ -153,9 +153,9 @@ public BackgroundScanner getBackgroundScanner() {
     @Override
     @SuppressWarnings("deprecation")
     public Observable<RxBleScanResult> scanBleDevices(@Nullable final UUID... filterServiceUUIDs) {
-        return Observable.defer(new Callable<ObservableSource<? extends RxBleScanResult>>() {
+        return Observable.defer(new Supplier<ObservableSource<? extends RxBleScanResult>>() {
             @Override
-            public ObservableSource<? extends RxBleScanResult> call() {
+            public ObservableSource<? extends RxBleScanResult> get() {
                 scanPreconditionVerifier.verify(true);
                 return initializeScan(filterServiceUUIDs);
             }

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java
@@ -24,11 +24,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableTransformer;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Single;
 
 /**
  * The BLE connection handle, supporting GATT operations. Operations are enqueued and the library makes sure that they are not

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleCustomOperation.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleCustomOperation.java
@@ -6,9 +6,9 @@
 import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback;
 import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * Represents a custom operation that will be enqueued for future execution within the client instance.

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDevice.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDevice.java
@@ -11,7 +11,7 @@
 import com.polidea.rxandroidble2.exceptions.BleGattCallbackTimeoutException;
 import com.polidea.rxandroidble2.exceptions.BleGattException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 public interface RxBleDevice {

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDeviceServices.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDeviceServices.java
@@ -13,10 +13,10 @@
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
 
 /**
  * Service discovery result containing list of services and characteristics within the services.

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleRadioOperationCustom.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleRadioOperationCustom.java
@@ -6,9 +6,9 @@
 import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback;
 import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @inheritDoc

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservable.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservable.java
@@ -7,9 +7,9 @@
 
 import java.nio.ByteBuffer;
 
-import io.reactivex.Emitter;
-import io.reactivex.Flowable;
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.core.Emitter;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Consumer;
 
 /**
  * TODO It may be possible to introduce backpressure here.

diff --git a/...roidble/src/main/java/com/polidea/rxandroidble2/helpers/LocationServicesOkObservable.java b/...roidble/src/main/java/com/polidea/rxandroidble2/helpers/LocationServicesOkObservable.java
@@ -10,8 +10,8 @@
 
 import bleshadow.javax.inject.Inject;
 import bleshadow.javax.inject.Named;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
 
 /**
  * An Observable that emits false if an attempt to scan with {@link com.polidea.rxandroidble2.RxBleClient#scanBleDevices(UUID...)}

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/DeviceModule.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/DeviceModule.java
@@ -2,7 +2,7 @@
 
 import android.bluetooth.BluetoothDevice;
 
-import com.jakewharton.rxrelay2.BehaviorRelay;
+import com.jakewharton.rxrelay3.BehaviorRelay;
 import com.polidea.rxandroidble2.ClientComponent;
 import com.polidea.rxandroidble2.ClientComponent.NamedSchedulers;
 import com.polidea.rxandroidble2.RxBleConnection;
@@ -20,7 +20,7 @@
 import bleshadow.dagger.Module;
 import bleshadow.dagger.Provides;
 import bleshadow.javax.inject.Named;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 @Module(subcomponents = ConnectionComponent.class)
 public abstract class DeviceModule {

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/QueueOperation.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/QueueOperation.java
@@ -8,9 +8,9 @@
 import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface;
 import com.polidea.rxandroidble2.internal.util.QueueReleasingEmitterWrapper;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 
 /**
  * The base class for all operations that are executed on the Bluetooth Queue.

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleDeviceImpl.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleDeviceImpl.java
@@ -3,7 +3,7 @@
 import android.bluetooth.BluetoothDevice;
 import androidx.annotation.Nullable;
 
-import com.jakewharton.rxrelay2.BehaviorRelay;
+import com.jakewharton.rxrelay3.BehaviorRelay;
 import com.polidea.rxandroidble2.ConnectionSetup;
 import com.polidea.rxandroidble2.RxBleConnection;
 import com.polidea.rxandroidble2.RxBleDevice;
@@ -12,13 +12,13 @@
 import com.polidea.rxandroidble2.internal.connection.Connector;
 
 import com.polidea.rxandroidble2.internal.logger.LoggerUtil;
-import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import bleshadow.javax.inject.Inject;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.functions.Action;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Supplier;
 
 @DeviceScope
 class RxBleDeviceImpl implements RxBleDevice {
@@ -69,9 +69,9 @@ public Observable<RxBleConnection> establishConnection(final boolean autoConnect
     }
 
     public Observable<RxBleConnection> establishConnection(final ConnectionSetup options) {
-        return Observable.defer(new Callable<ObservableSource<RxBleConnection>>() {
+        return Observable.defer(new Supplier<ObservableSource<? extends RxBleConnection>>() {
             @Override
-            public ObservableSource<RxBleConnection> call() {
+            public ObservableSource<RxBleConnection> get() {
                 if (isConnected.compareAndSet(false, true)) {
                     return connector.prepareConnection(options)
                             .doFinally(new Action() {

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/SingleResponseOperation.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/SingleResponseOperation.java
@@ -16,10 +16,10 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.Scheduler;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Single;
 
 /**
  * A convenience class intended to use with {@link BluetoothGatt} functions that fire one-time actions.

diff --git a/...roidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ConnectionModule.java b/...roidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ConnectionModule.java
@@ -19,7 +19,7 @@
 import bleshadow.dagger.multibindings.IntoSet;
 import bleshadow.javax.inject.Named;
 import bleshadow.javax.inject.Provider;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 import static com.polidea.rxandroidble2.internal.connection.ConnectionComponent.NamedBooleans.SUPPRESS_OPERATION_CHECKS;
 import static com.polidea.rxandroidble2.internal.connection.ConnectionComponent.NamedInts.GATT_MTU_MINIMUM;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/Connector.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/Connector.java
@@ -4,7 +4,7 @@
 import com.polidea.rxandroidble2.ConnectionSetup;
 import com.polidea.rxandroidble2.RxBleConnection;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 public interface Connector {