Skip to content

Commit 8268dc0

Browse files
dariuszsewerynz3ntu
authored and
Drjacky
committed
Updated library to use RxJava 3 artifact. Fixed library errors.
Co-authored-by: Luca Weiss <[email protected]>
1 parent 0ba4132 commit 8268dc0

File tree

94 files changed

+352
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+352
-350
lines changed

‎dependencies.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ext {
2-
rxJavaVersion = '2.2.17'
3-
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
4-
targetCompatibilityVersion = JavaVersion.VERSION_1_7
2+
rxJavaVersion = '3.0.11'
3+
sourceCompatibilityVersion = JavaVersion.VERSION_1_8
4+
targetCompatibilityVersion = JavaVersion.VERSION_1_8
55
shadowPluginVersion = '5.0.0'
66
daggerVersion = '2.15'
77
libs = [
88
/* Library-only dependencies */
9-
rxjava : "io.reactivex.rxjava2:rxjava:$rxJavaVersion",
9+
rxjava : "io.reactivex.rxjava3:rxjava:$rxJavaVersion",
1010
rxandroid : 'io.reactivex.rxjava2:rxandroid:2.1.1',
11-
rxrelay : 'com.jakewharton.rxrelay2:rxrelay:2.1.1',
11+
rxrelay : 'com.jakewharton.rxrelay3:rxrelay:3.0.0',
1212
junit : 'junit:junit:4.13',
1313
groovy : 'org.codehaus.groovy:groovy:2.5.8',
1414
spock : ['org.spockframework:spock-core:1.2-groovy-2.5',
@@ -21,8 +21,8 @@ ext {
2121
annotations : "androidx.annotation:annotation:1.1.0",
2222
robolectric : 'org.robolectric:robolectric:3.8',
2323
/* Sample apps-only dependencies */
24-
rxjava_replayingshare : 'com.jakewharton.rx2:replaying-share:2.2.0',
25-
rxjava_binding : 'com.jakewharton.rxbinding3:rxbinding:3.1.0',
24+
rxjava_replayingshare : 'com.jakewharton.rx3:replaying-share:3.0.0',
25+
rxjava_binding : 'com.jakewharton.rxbinding4:rxbinding:4.0.0',
2626
appcompat : 'androidx.appcompat:appcompat:1.1.0',
2727
material_design : 'com.google.android.material:material:1.0.0'
2828
]

‎mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import java.util.Set;
2525
import java.util.UUID;
2626

27-
import io.reactivex.Observable;
28-
import io.reactivex.functions.Function;
29-
import io.reactivex.functions.Predicate;
27+
import io.reactivex.rxjava3.core.Observable;
28+
import io.reactivex.rxjava3.functions.Function;
29+
import io.reactivex.rxjava3.functions.Predicate;
3030
import io.reactivex.subjects.ReplaySubject;
3131

3232
/**

‎mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMock.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
import java.util.concurrent.TimeUnit;
3737
import java.util.concurrent.atomic.AtomicInteger;
3838

39-
import io.reactivex.Completable;
40-
import io.reactivex.Observable;
41-
import io.reactivex.ObservableSource;
42-
import io.reactivex.Single;
43-
import io.reactivex.SingleSource;
44-
import io.reactivex.disposables.Disposable;
45-
import io.reactivex.functions.Action;
46-
import io.reactivex.functions.Consumer;
47-
import io.reactivex.functions.Function;
48-
import io.reactivex.functions.Predicate;
49-
import io.reactivex.internal.functions.Functions;
39+
import io.reactivex.rxjava3.core.Completable;
40+
import io.reactivex.rxjava3.core.Observable;
41+
import io.reactivex.rxjava3.core.ObservableSource;
42+
import io.reactivex.rxjava3.core.Single;
43+
import io.reactivex.rxjava3.core.SingleSource;
44+
import io.reactivex.rxjava3.disposables.Disposable;
45+
import io.reactivex.rxjava3.functions.Action;
46+
import io.reactivex.rxjava3.functions.Consumer;
47+
import io.reactivex.rxjava3.functions.Function;
48+
import io.reactivex.rxjava3.functions.Predicate;
49+
import io.reactivex.rxjava3.internal.functions.Functions;
5050
import io.reactivex.subjects.CompletableSubject;
5151
import io.reactivex.subjects.SingleSubject;
5252

‎mockrxandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleDeviceMock.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import java.util.concurrent.Callable;
2727
import java.util.concurrent.atomic.AtomicBoolean;
2828

29-
import io.reactivex.Observable;
30-
import io.reactivex.disposables.Disposable;
31-
import io.reactivex.functions.Action;
32-
import io.reactivex.functions.Consumer;
33-
import io.reactivex.subjects.BehaviorSubject;
29+
import io.reactivex.rxjava3.core.Observable;
30+
import io.reactivex.rxjava3.disposables.Disposable;
31+
import io.reactivex.rxjava3.functions.Action;
32+
import io.reactivex.rxjava3.functions.Consumer;
33+
import io.reactivex.rxjava3.subjects.BehaviorSubject;
3434
import io.reactivex.subjects.ReplaySubject;
3535

3636
import static com.polidea.rxandroidble2.RxBleConnection.RxBleConnectionState.CONNECTED;

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/ClientComponent.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
import bleshadow.dagger.Provides;
4747
import bleshadow.javax.inject.Named;
4848
import bleshadow.javax.inject.Provider;
49-
import io.reactivex.Observable;
50-
import io.reactivex.Scheduler;
51-
import io.reactivex.functions.Function;
52-
import io.reactivex.plugins.RxJavaPlugins;
53-
import io.reactivex.schedulers.Schedulers;
49+
import io.reactivex.rxjava3.core.Observable;
50+
import io.reactivex.rxjava3.core.Scheduler;
51+
import io.reactivex.rxjava3.functions.Function;
52+
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
53+
import io.reactivex.rxjava3.schedulers.Schedulers;
5454

5555
@ClientScope
5656
@Component(modules = {ClientComponent.ClientModule.class})

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleAdapterStateObservable.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
import bleshadow.javax.inject.Inject;
1111
import com.polidea.rxandroidble2.internal.RxBleLog;
12-
import io.reactivex.Observable;
13-
import io.reactivex.ObservableEmitter;
14-
import io.reactivex.ObservableOnSubscribe;
15-
import io.reactivex.Observer;
16-
import io.reactivex.functions.Cancellable;
17-
import io.reactivex.schedulers.Schedulers;
12+
import io.reactivex.rxjava3.core.Observable;
13+
import io.reactivex.rxjava3.core.ObservableEmitter;
14+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
15+
import io.reactivex.rxjava3.core.Observer;
16+
import io.reactivex.rxjava3.functions.Cancellable;
17+
import io.reactivex.rxjava3.schedulers.Schedulers;
1818

1919
/**
2020
* Observes Bluetooth adapter state. This responds to user interactions as well as system controlled state changes.

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.Set;
1414
import java.util.UUID;
1515

16-
import io.reactivex.Observable;
16+
import io.reactivex.rxjava3.core.Observable;
1717

1818

1919
public abstract class RxBleClient {

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClientImpl.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,26 @@
2626
import com.polidea.rxandroidble2.scan.ScanResult;
2727
import com.polidea.rxandroidble2.scan.ScanSettings;
2828

29-
import io.reactivex.functions.Consumer;
30-
3129
import java.util.Arrays;
3230
import java.util.HashMap;
3331
import java.util.HashSet;
3432
import java.util.Map;
3533
import java.util.Set;
3634
import java.util.UUID;
37-
import java.util.concurrent.Callable;
3835

3936
import bleshadow.dagger.Lazy;
4037
import bleshadow.javax.inject.Inject;
4138
import bleshadow.javax.inject.Named;
42-
import io.reactivex.Maybe;
43-
import io.reactivex.MaybeSource;
44-
import io.reactivex.Observable;
45-
import io.reactivex.ObservableSource;
46-
import io.reactivex.Scheduler;
47-
import io.reactivex.functions.Action;
48-
import io.reactivex.functions.Function;
49-
import io.reactivex.functions.Predicate;
39+
import io.reactivex.rxjava3.core.Maybe;
40+
import io.reactivex.rxjava3.core.MaybeSource;
41+
import io.reactivex.rxjava3.core.Observable;
42+
import io.reactivex.rxjava3.core.ObservableSource;
43+
import io.reactivex.rxjava3.core.Scheduler;
44+
import io.reactivex.rxjava3.functions.Action;
45+
import io.reactivex.rxjava3.functions.Consumer;
46+
import io.reactivex.rxjava3.functions.Function;
47+
import io.reactivex.rxjava3.functions.Predicate;
48+
import io.reactivex.rxjava3.functions.Supplier;
5049

5150
class RxBleClientImpl extends RxBleClient {
5251

@@ -125,9 +124,9 @@ public Set<RxBleDevice> getBondedDevices() {
125124

126125
@Override
127126
public Observable<ScanResult> scanBleDevices(final ScanSettings scanSettings, final ScanFilter... scanFilters) {
128-
return Observable.defer(new Callable<ObservableSource<? extends ScanResult>>() {
127+
return Observable.defer(new Supplier<ObservableSource<? extends ScanResult>>() {
129128
@Override
130-
public Observable<ScanResult> call() {
129+
public Observable<ScanResult> get() {
131130
scanPreconditionVerifier.verify(scanSettings.shouldCheckLocationProviderState());
132131
final ScanSetup scanSetup = scanSetupBuilder.build(scanSettings, scanFilters);
133132
final Operation<RxBleInternalScanResult> scanOperation = scanSetup.scanOperation;
@@ -154,9 +153,9 @@ public BackgroundScanner getBackgroundScanner() {
154153
@Override
155154
@Deprecated
156155
public Observable<RxBleScanResult> scanBleDevices(@Nullable final UUID... filterServiceUUIDs) {
157-
return Observable.defer(new Callable<ObservableSource<? extends RxBleScanResult>>() {
156+
return Observable.defer(new Supplier<ObservableSource<? extends RxBleScanResult>>() {
158157
@Override
159-
public ObservableSource<? extends RxBleScanResult> call() {
158+
public ObservableSource<? extends RxBleScanResult> get() {
160159
scanPreconditionVerifier.verify(true);
161160
return initializeScan(filterServiceUUIDs);
162161
}

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import java.util.UUID;
2525
import java.util.concurrent.TimeUnit;
2626

27-
import io.reactivex.Completable;
28-
import io.reactivex.Observable;
29-
import io.reactivex.ObservableTransformer;
30-
import io.reactivex.Scheduler;
31-
import io.reactivex.Single;
27+
import io.reactivex.rxjava3.core.Completable;
28+
import io.reactivex.rxjava3.core.Observable;
29+
import io.reactivex.rxjava3.core.ObservableTransformer;
30+
import io.reactivex.rxjava3.core.Scheduler;
31+
import io.reactivex.rxjava3.core.Single;
3232

3333
/**
3434
* The BLE connection handle, supporting GATT operations. Operations are enqueued and the library makes sure that they are not

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleCustomOperation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback;
77
import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue;
88

9-
import io.reactivex.Observable;
10-
import io.reactivex.Observer;
11-
import io.reactivex.Scheduler;
9+
import io.reactivex.rxjava3.core.Observable;
10+
import io.reactivex.rxjava3.core.Observer;
11+
import io.reactivex.rxjava3.core.Scheduler;
1212

1313
/**
1414
* Represents a custom operation that will be enqueued for future execution within the client instance.

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDevice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.polidea.rxandroidble2.exceptions.BleGattCallbackTimeoutException;
1212
import com.polidea.rxandroidble2.exceptions.BleGattException;
1313

14-
import io.reactivex.Observable;
14+
import io.reactivex.rxjava3.core.Observable;
1515

1616

1717
public interface RxBleDevice {

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDeviceServices.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import java.util.UUID;
1414
import java.util.concurrent.Callable;
1515

16-
import io.reactivex.Observable;
17-
import io.reactivex.Single;
18-
import io.reactivex.functions.Function;
19-
import io.reactivex.functions.Predicate;
16+
import io.reactivex.rxjava3.core.Observable;
17+
import io.reactivex.rxjava3.core.Single;
18+
import io.reactivex.rxjava3.functions.Function;
19+
import io.reactivex.rxjava3.functions.Predicate;
2020

2121
/**
2222
* Service discovery result containing list of services and characteristics within the services.

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleRadioOperationCustom.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback;
77
import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue;
88

9-
import io.reactivex.Observable;
10-
import io.reactivex.Observer;
11-
import io.reactivex.Scheduler;
9+
import io.reactivex.rxjava3.core.Observable;
10+
import io.reactivex.rxjava3.core.Observer;
11+
import io.reactivex.rxjava3.core.Scheduler;
1212

1313
/**
1414
* @inheritDoc

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import java.nio.ByteBuffer;
99

10-
import io.reactivex.Emitter;
11-
import io.reactivex.Flowable;
12-
import io.reactivex.functions.Consumer;
10+
import io.reactivex.rxjava3.core.Emitter;
11+
import io.reactivex.rxjava3.core.Flowable;
12+
import io.reactivex.rxjava3.functions.Consumer;
1313

1414
/**
1515
* TODO It may be possible to introduce backpressure here.

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/LocationServicesOkObservable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import bleshadow.javax.inject.Inject;
1212
import bleshadow.javax.inject.Named;
13-
import io.reactivex.Observable;
14-
import io.reactivex.Observer;
13+
import io.reactivex.rxjava3.core.Observable;
14+
import io.reactivex.rxjava3.core.Observer;
1515

1616
/**
1717
* An Observable that emits false if an attempt to scan with {@link com.polidea.rxandroidble2.RxBleClient#scanBleDevices(UUID...)}

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/DeviceModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.bluetooth.BluetoothDevice;
44

5-
import com.jakewharton.rxrelay2.BehaviorRelay;
5+
import com.jakewharton.rxrelay3.BehaviorRelay;
66
import com.polidea.rxandroidble2.ClientComponent;
77
import com.polidea.rxandroidble2.ClientComponent.NamedSchedulers;
88
import com.polidea.rxandroidble2.RxBleConnection;
@@ -20,7 +20,7 @@
2020
import bleshadow.dagger.Module;
2121
import bleshadow.dagger.Provides;
2222
import bleshadow.javax.inject.Named;
23-
import io.reactivex.Scheduler;
23+
import io.reactivex.rxjava3.core.Scheduler;
2424

2525
@Module(subcomponents = ConnectionComponent.class)
2626
public abstract class DeviceModule {

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/QueueOperation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import com.polidea.rxandroidble2.internal.serialization.QueueReleaseInterface;
99
import com.polidea.rxandroidble2.internal.util.QueueReleasingEmitterWrapper;
1010

11-
import io.reactivex.Observable;
12-
import io.reactivex.ObservableEmitter;
13-
import io.reactivex.ObservableOnSubscribe;
11+
import io.reactivex.rxjava3.core.Observable;
12+
import io.reactivex.rxjava3.core.ObservableEmitter;
13+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
1414

1515
/**
1616
* The base class for all operations that are executed on the Bluetooth Queue.

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleDeviceImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.bluetooth.BluetoothDevice;
44
import androidx.annotation.Nullable;
55

6-
import com.jakewharton.rxrelay2.BehaviorRelay;
6+
import com.jakewharton.rxrelay3.BehaviorRelay;
77
import com.polidea.rxandroidble2.ConnectionSetup;
88
import com.polidea.rxandroidble2.RxBleConnection;
99
import com.polidea.rxandroidble2.RxBleDevice;
@@ -12,13 +12,13 @@
1212
import com.polidea.rxandroidble2.internal.connection.Connector;
1313

1414
import com.polidea.rxandroidble2.internal.logger.LoggerUtil;
15-
import java.util.concurrent.Callable;
1615
import java.util.concurrent.atomic.AtomicBoolean;
1716

1817
import bleshadow.javax.inject.Inject;
19-
import io.reactivex.Observable;
20-
import io.reactivex.ObservableSource;
21-
import io.reactivex.functions.Action;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableSource;
20+
import io.reactivex.rxjava3.functions.Action;
21+
import io.reactivex.rxjava3.functions.Supplier;
2222

2323
@DeviceScope
2424
class RxBleDeviceImpl implements RxBleDevice {
@@ -69,9 +69,9 @@ public Observable<RxBleConnection> establishConnection(final boolean autoConnect
6969
}
7070

7171
public Observable<RxBleConnection> establishConnection(final ConnectionSetup options) {
72-
return Observable.defer(new Callable<ObservableSource<RxBleConnection>>() {
72+
return Observable.defer(new Supplier<ObservableSource<? extends RxBleConnection>>() {
7373
@Override
74-
public ObservableSource<RxBleConnection> call() {
74+
public ObservableSource<RxBleConnection> get() {
7575
if (isConnected.compareAndSet(false, true)) {
7676
return connector.prepareConnection(options)
7777
.doFinally(new Action() {

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/SingleResponseOperation.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
import java.util.concurrent.TimeUnit;
1818

19-
import io.reactivex.Observable;
20-
import io.reactivex.ObservableEmitter;
21-
import io.reactivex.Scheduler;
22-
import io.reactivex.Single;
19+
import io.reactivex.rxjava3.core.Observable;
20+
import io.reactivex.rxjava3.core.ObservableEmitter;
21+
import io.reactivex.rxjava3.core.Scheduler;
22+
import io.reactivex.rxjava3.core.Single;
2323

2424
/**
2525
* A convenience class intended to use with {@link BluetoothGatt} functions that fire one-time actions.

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/ConnectionModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import bleshadow.dagger.multibindings.IntoSet;
2020
import bleshadow.javax.inject.Named;
2121
import bleshadow.javax.inject.Provider;
22-
import io.reactivex.Scheduler;
22+
import io.reactivex.rxjava3.core.Scheduler;
2323

2424
import static com.polidea.rxandroidble2.internal.connection.ConnectionComponent.NamedBooleans.SUPPRESS_OPERATION_CHECKS;
2525
import static com.polidea.rxandroidble2.internal.connection.ConnectionComponent.NamedInts.GATT_MTU_MINIMUM;

‎rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/connection/Connector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.polidea.rxandroidble2.ConnectionSetup;
55
import com.polidea.rxandroidble2.RxBleConnection;
66

7-
import io.reactivex.Observable;
7+
import io.reactivex.rxjava3.core.Observable;
88

99
public interface Connector {
1010

0 commit comments

Comments
 (0)