Update imports for tests

dariuszseweryn · Sep 15, 2020 · ceceff0 · ceceff0
1 parent 5c1e526
commit ceceff0
Show file tree

Hide file tree

Showing 39 changed files with 120 additions and 120 deletions.
diff --git a/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java b/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java
@@ -27,7 +27,7 @@
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.subjects.ReplaySubject;
+import io.reactivex.rxjava3.subjects.ReplaySubject;
 
 /**
  * A mocked {@link RxBleClient}. Callers supply device parameters such as services,

diff --git a/...c/test/groovy/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMockLegacyTest.groovy b/...c/test/groovy/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMockLegacyTest.groovy
@@ -7,8 +7,8 @@ import com.polidea.rxandroidble2.RxBleConnection
 import com.polidea.rxandroidble2.scan.ScanFilter
 import com.polidea.rxandroidble2.scan.ScanSettings
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.robolectric.annotation.Config
 
 @Config(manifest = Config.NONE, constants = BuildConfig, sdk = Build.VERSION_CODES.LOLLIPOP)

diff --git a/...ble/src/test/groovy/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMockTest.groovy b/...ble/src/test/groovy/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMockTest.groovy
@@ -7,7 +7,7 @@ import com.polidea.rxandroidble2.RxBleConnection
 import com.polidea.rxandroidble2.scan.ScanFilter;
 import com.polidea.rxandroidble2.scan.ScanSettings;
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.robolectric.annotation.Config
 
 @Config(manifest = Config.NONE, constants = BuildConfig, sdk = Build.VERSION_CODES.LOLLIPOP)

diff --git a/...src/test/groovy/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMockTest.groovy b/...src/test/groovy/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMockTest.groovy
@@ -8,8 +8,8 @@ import com.polidea.rxandroidble2.exceptions.BleGattDescriptorException
 import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattReadResultMock
 import com.polidea.rxandroidble2.mockrxandroidble.callbacks.results.RxBleGattWriteResultMock
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.robolectric.annotation.Config
 
 @Config(manifest = Config.NONE, constants = BuildConfig, sdk = Build.VERSION_CODES.LOLLIPOP)

diff --git a/rxandroidble/src/test/groovy/com/polidea/rxandroidble2/DummyOperationQueue.groovy b/rxandroidble/src/test/groovy/com/polidea/rxandroidble2/DummyOperationQueue.groovy
@@ -4,10 +4,10 @@ import com.polidea.rxandroidble2.exceptions.BleException
 import com.polidea.rxandroidble2.internal.operations.Operation
 import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue
 import com.polidea.rxandroidble2.internal.util.DisposableUtil
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
-import io.reactivex.ObservableOnSubscribe
-import io.reactivex.annotations.NonNull
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.ObservableEmitter
+import io.reactivex.rxjava3.core.ObservableOnSubscribe
+import io.reactivex.rxjava3.annotations.NonNull
 
 class DummyOperationQueue implements ConnectionOperationQueue {
     public final MockSemaphore semaphore = new MockSemaphore()

diff --git a/rxandroidble/src/test/groovy/com/polidea/rxandroidble2/MockOperation.groovy b/rxandroidble/src/test/groovy/com/polidea/rxandroidble2/MockOperation.groovy
@@ -6,8 +6,8 @@ import com.polidea.rxandroidble2.exceptions.BleException
 import com.polidea.rxandroidble2.internal.Priority
 import com.polidea.rxandroidble2.internal.QueueOperation
 import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface
-import io.reactivex.ObservableEmitter
-import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.rxjava3.core.ObservableEmitter
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 
 public class MockOperation extends QueueOperation<Object> {
 
@@ -53,7 +53,7 @@ public class MockOperation extends QueueOperation<Object> {
         return new BleDisconnectedException("MockDeviceAddress")
     }
 
-    public io.reactivex.Observable<MockOperation> getFinishedRunningObservable() {
+    public io.reactivex.rxjava3.core.Observable<MockOperation> getFinishedRunningObservable() {
         behaviorSubject
     }
 }
diff --git a/...droidble/src/test/groovy/com/polidea/rxandroidble2/MockRxBleAdapterStateObservable.groovy b/...droidble/src/test/groovy/com/polidea/rxandroidble2/MockRxBleAdapterStateObservable.groovy
@@ -1,11 +1,11 @@
 package com.polidea.rxandroidble2
 
 import com.polidea.rxandroidble2.internal.util.DisposableUtil
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
-import io.reactivex.ObservableOnSubscribe
-import io.reactivex.annotations.NonNull
-import io.reactivex.subjects.ReplaySubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.ObservableEmitter
+import io.reactivex.rxjava3.core.ObservableOnSubscribe
+import io.reactivex.rxjava3.annotations.NonNull
+import io.reactivex.rxjava3.subjects.ReplaySubject
 
 class MockRxBleAdapterStateObservable {
 

diff --git a/...droidble/src/test/groovy/com/polidea/rxandroidble2/RxBleAdapterStateObservableTest.groovy b/...droidble/src/test/groovy/com/polidea/rxandroidble2/RxBleAdapterStateObservableTest.groovy
@@ -5,7 +5,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import org.robolectric.annotation.Config
 
 import static com.polidea.rxandroidble2.RxBleAdapterStateObservable.BleAdapterState.*

diff --git a/...idble/src/test/groovy/com/polidea/rxandroidble2/extensions/TestSubscriberExtension.groovy b/...idble/src/test/groovy/com/polidea/rxandroidble2/extensions/TestSubscriberExtension.groovy
@@ -3,9 +3,9 @@ package com.polidea.rxandroidble2.extensions
 import android.bluetooth.BluetoothGattService
 import com.polidea.rxandroidble2.RxBleDeviceServices
 import com.polidea.rxandroidble2.RxBleScanResult
-import io.reactivex.observers.BaseTestConsumer
-import io.reactivex.observers.TestObserver
-import io.reactivex.subscribers.TestSubscriber
+import io.reactivex.rxjava3.observers.BaseTestConsumer
+import io.reactivex.rxjava3.observers.TestObserver
+import io.reactivex.rxjava3.subscribers.TestSubscriber
 
 class TestSubscriberExtension {
 

diff --git a/...ble/src/test/groovy/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservableTest.groovy b/...ble/src/test/groovy/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservableTest.groovy
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.helpers
 
-import io.reactivex.annotations.NonNull
-import io.reactivex.functions.Predicate
+import io.reactivex.rxjava3.annotations.NonNull
+import io.reactivex.rxjava3.functions.Predicate
 import spock.lang.Specification
 import spock.lang.Unroll
 

diff --git a/...roidble/src/test/groovy/com/polidea/rxandroidble2/internal/RxBleDeviceProviderTest.groovy b/...roidble/src/test/groovy/com/polidea/rxandroidble2/internal/RxBleDeviceProviderTest.groovy
@@ -21,7 +21,7 @@ class RxBleDeviceProviderTest extends Specification {
         private final String macAddress;
 
         @Override
-        io.reactivex.Observable<RxBleConnection.RxBleConnectionState> observeConnectionStateChanges() {
+        io.reactivex.rxjava3.core.Observable<RxBleConnection.RxBleConnectionState> observeConnectionStateChanges() {
             throw UnsupportedOperationException()
         }
 
@@ -31,16 +31,16 @@ class RxBleDeviceProviderTest extends Specification {
         }
 
         @Override
-        io.reactivex.Observable<RxBleConnection> establishConnection(boolean autoConnect) {
+        io.reactivex.rxjava3.core.Observable<RxBleConnection> establishConnection(boolean autoConnect) {
             throw UnsupportedOperationException()
         }
 
         @Override
-        io.reactivex.Observable<RxBleConnection> establishConnection(boolean autoConnect, Timeout operationTimeoutSetup) {
+        io.reactivex.rxjava3.core.Observable<RxBleConnection> establishConnection(boolean autoConnect, Timeout operationTimeoutSetup) {
             establishConnection(autoConnect)
         }
 //        @Override
-        io.reactivex.Observable<RxBleConnection> establishConnection(ConnectionSetup options) {
+        io.reactivex.rxjava3.core.Observable<RxBleConnection> establishConnection(ConnectionSetup options) {
             throw UnsupportedOperationException()
         }
 

diff --git a/rxandroidble/src/test/groovy/com/polidea/rxandroidble2/internal/RxBleDeviceTest.groovy b/rxandroidble/src/test/groovy/com/polidea/rxandroidble2/internal/RxBleDeviceTest.groovy
@@ -2,16 +2,16 @@ package com.polidea.rxandroidble2.internal
 
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt
-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
 import com.polidea.rxandroidble2.exceptions.BleAlreadyConnectedException
 import com.polidea.rxandroidble2.exceptions.BleGattException
 import com.polidea.rxandroidble2.exceptions.BleGattOperationType
 import com.polidea.rxandroidble2.internal.connection.Connector
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
@@ -317,7 +317,7 @@ class RxBleDeviceTest extends Specification {
         rxStartConnecting().subscribe({}, {})
     }
 
-    io.reactivex.Observable<RxBleConnection> rxStartConnecting() {
+    Observable<RxBleConnection> rxStartConnecting() {
         return rxBleDevice.establishConnection(false)
     }
 
@@ -358,7 +358,7 @@ class RxBleDeviceTest extends Specification {
             this.connectionSetup = connectionSetup
         }
 
-        io.reactivex.Observable<RxBleConnection> establishConnection(RxBleDevice d) {
+        Observable<RxBleConnection> establishConnection(RxBleDevice d) {
             return establishConnectionCaller.connectionStartClosure.call(d, connectionSetup)
         }
 

diff --git a/...ble/src/test/groovy/com/polidea/rxandroidble2/internal/SingleResponseOperationTest.groovy b/...ble/src/test/groovy/com/polidea/rxandroidble2/internal/SingleResponseOperationTest.groovy
@@ -8,10 +8,10 @@ import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback
 import com.polidea.rxandroidble2.internal.operations.TimeoutConfiguration
 import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface
 import com.polidea.rxandroidble2.internal.util.MockOperationTimeoutConfiguration
-import io.reactivex.Single
-import io.reactivex.observers.TestObserver
-import io.reactivex.schedulers.TestScheduler
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.observers.TestObserver
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll

diff --git a/...le/src/test/groovy/com/polidea/rxandroidble2/internal/connection/ConnectorImplTest.groovy b/...le/src/test/groovy/com/polidea/rxandroidble2/internal/connection/ConnectorImplTest.groovy
@@ -6,9 +6,9 @@ import com.polidea.rxandroidble2.RxBleConnection
 import com.polidea.rxandroidble2.Timeout
 import com.polidea.rxandroidble2.internal.operations.ConnectOperation
 import com.polidea.rxandroidble2.internal.serialization.ClientOperationQueue
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Specification
 import spock.lang.Unroll
 

diff --git a/.../test/groovy/com/polidea/rxandroidble2/internal/connection/DisconnectionRouterTest.groovy b/.../test/groovy/com/polidea/rxandroidble2/internal/connection/DisconnectionRouterTest.groovy
@@ -8,7 +8,7 @@ import com.polidea.rxandroidble2.exceptions.BleGattException
 import com.polidea.rxandroidble2.exceptions.BleGattOperationType
 import com.polidea.rxandroidble2.internal.util.RxBleAdapterWrapper
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.robolectric.annotation.Config
 import spock.lang.Shared
 import spock.lang.Unroll

diff --git a/...idble/src/test/groovy/com/polidea/rxandroidble2/internal/connection/MtuWatcherTest.groovy b/...idble/src/test/groovy/com/polidea/rxandroidble2/internal/connection/MtuWatcherTest.groovy
@@ -4,8 +4,8 @@ import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt
 import com.polidea.rxandroidble2.exceptions.BleGattException
 import com.polidea.rxandroidble2.exceptions.BleGattOperationType
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Specification
 import spock.lang.Unroll
 

diff --git a/...com/polidea/rxandroidble2/internal/connection/NotificationAndIndicationManagerTest.groovy b/...com/polidea/rxandroidble2/internal/connection/NotificationAndIndicationManagerTest.groovy
@@ -8,14 +8,14 @@ import com.polidea.rxandroidble2.exceptions.BleCannotSetCharacteristicNotificati
 import com.polidea.rxandroidble2.exceptions.BleConflictingNotificationAlreadySetException
 import com.polidea.rxandroidble2.internal.util.CharacteristicChangedEvent
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.reactivex.rxjava3.subjects.PublishSubject
 import org.robolectric.annotation.Config
 import spock.lang.Unroll
 
-import static io.reactivex.Observable.just
+import static io.reactivex.rxjava3.core.Observable.just
 
 @Config(manifest = Config.NONE)
 class NotificationAndIndicationManagerTest extends ElectricSpecification {

diff --git a/.../src/test/groovy/com/polidea/rxandroidble2/internal/connection/RxBleConnectionTest.groovy b/.../src/test/groovy/com/polidea/rxandroidble2/internal/connection/RxBleConnectionTest.groovy
@@ -11,20 +11,20 @@ import com.polidea.rxandroidble2.internal.operations.ReadRssiOperation
 import com.polidea.rxandroidble2.internal.util.ByteAssociation
 import com.polidea.rxandroidble2.internal.util.MockOperationTimeoutConfiguration
 import com.polidea.rxandroidble2.internal.logger.LoggerUtilBluetoothServices
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.Scheduler
-import io.reactivex.Single
-import io.reactivex.functions.Predicate
-import io.reactivex.schedulers.TestScheduler
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.functions.Predicate
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Specification
 import spock.lang.Unroll
 
 import java.util.concurrent.TimeUnit
 
-import static io.reactivex.Observable.just
+import static io.reactivex.rxjava3.core.Observable.just
 
 class RxBleConnectionTest extends Specification {
 
@@ -130,7 +130,7 @@ class RxBleConnectionTest extends Specification {
         testSubscriber.assertErrorMessage("GATT exception from MAC address null, with type BleGattOperation{description='READ_RSSI'}")
         testSubscriber.assertError(new Predicate<BleGattCannotStartException>() {
             @Override
-            boolean test(@io.reactivex.annotations.NonNull BleGattCannotStartException throwable) throws Exception {
+            boolean test(@io.reactivex.rxjava3.annotations.NonNull BleGattCannotStartException throwable) throws Exception {
                 return throwable.bleGattOperationType == BleGattOperationType.READ_RSSI
             }
         })

diff --git a/...ovy/com/polidea/rxandroidble2/internal/connection/RxBleGattCallbackPerformanceTest.groovy b/...ovy/com/polidea/rxandroidble2/internal/connection/RxBleGattCallbackPerformanceTest.groovy
@@ -4,8 +4,8 @@ import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCallback
 import android.bluetooth.BluetoothGattCharacteristic
-import io.reactivex.Observable
-import io.reactivex.schedulers.TestScheduler
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.schedulers.TestScheduler
 import spock.lang.Ignore
 import spock.lang.Shared
 import spock.lang.Specification

diff --git a/...rc/test/groovy/com/polidea/rxandroidble2/internal/connection/RxBleGattCallbackTest.groovy b/...rc/test/groovy/com/polidea/rxandroidble2/internal/connection/RxBleGattCallbackTest.groovy
@@ -11,14 +11,14 @@ import com.polidea.rxandroidble2.exceptions.*
 import com.polidea.rxandroidble2.internal.util.ByteAssociation
 import com.polidea.rxandroidble2.internal.util.CharacteristicChangedEvent
 import hkhc.electricspock.ElectricSpecification
-import io.reactivex.Observable
-import io.reactivex.annotations.NonNull
-import io.reactivex.functions.Predicate
-import io.reactivex.functions.Function
-import io.reactivex.observers.TestObserver
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.schedulers.TestScheduler
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.annotations.NonNull
+import io.reactivex.rxjava3.functions.Predicate
+import io.reactivex.rxjava3.functions.Function
+import io.reactivex.rxjava3.observers.TestObserver
+import io.reactivex.rxjava3.schedulers.Schedulers
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.function.Consumer
 import org.robolectric.annotation.Config
 import spock.lang.Shared

diff --git a/...t/groovy/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManagerTest.groovy b/...t/groovy/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManagerTest.groovy
@@ -6,8 +6,8 @@ import com.polidea.rxandroidble2.RxBleDeviceServices
 import com.polidea.rxandroidble2.internal.operations.OperationsProvider
 import com.polidea.rxandroidble2.internal.operations.ServiceDiscoveryOperation
 import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit

diff --git a/...com/polidea/rxandroidble2/internal/operations/OperationCharacteristicLongWriteTest.groovy b/...com/polidea/rxandroidble2/internal/operations/OperationCharacteristicLongWriteTest.groovy
@@ -13,16 +13,16 @@ import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface
 import com.polidea.rxandroidble2.internal.util.ByteAssociation
 import com.polidea.rxandroidble2.internal.util.MockOperationTimeoutConfiguration
 import com.polidea.rxandroidble2.internal.util.QueueReleasingEmitterWrapper
-import io.reactivex.Observable
-import io.reactivex.ObservableSource
-import io.reactivex.Scheduler
-import io.reactivex.annotations.NonNull
-import io.reactivex.functions.Function
-import io.reactivex.observers.TestObserver
-import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.schedulers.TestScheduler
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.annotations.NonNull
+import io.reactivex.rxjava3.functions.Function
+import io.reactivex.rxjava3.observers.TestObserver
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.schedulers.Schedulers
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.atomic.AtomicReference
 import spock.lang.Shared
 import spock.lang.Specification

diff --git a/...oovy/com/polidea/rxandroidble2/internal/operations/OperationCharacteristicReadTest.groovy b/...oovy/com/polidea/rxandroidble2/internal/operations/OperationCharacteristicReadTest.groovy
@@ -9,8 +9,8 @@ import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback
 import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface
 import com.polidea.rxandroidble2.internal.util.ByteAssociation
 import com.polidea.rxandroidble2.internal.util.MockOperationTimeoutConfiguration
-import io.reactivex.schedulers.TestScheduler
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit

diff --git a/...ovy/com/polidea/rxandroidble2/internal/operations/OperationCharacteristicWriteTest.groovy b/...ovy/com/polidea/rxandroidble2/internal/operations/OperationCharacteristicWriteTest.groovy
@@ -9,8 +9,8 @@ import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback
 import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface
 import com.polidea.rxandroidble2.internal.util.ByteAssociation
 import com.polidea.rxandroidble2.internal.util.MockOperationTimeoutConfiguration
-import io.reactivex.schedulers.TestScheduler
-import io.reactivex.subjects.PublishSubject
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import io.reactivex.rxjava3.subjects.PublishSubject
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit