Migrated to AndoridX (#497)

More info about https://developer.android.com/jetpack/androidx/
dariuszseweryn · Oct 12, 2018 · ef41f6e · ef41f6e
1 parent 7242dbc
commit ef41f6e
Show file tree

Hide file tree

Showing 97 changed files with 147 additions and 146 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,14 +1,12 @@
 ext {
-    supportVersion = '27.1.0'
     rxJavaVersion = '2.2.2'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
     shadowPluginVersion = '2.0.2'
     daggerVersion = '2.15'
     libs = [
             /* Application dependencies */
-            support            : "com.android.support:support-v4:$supportVersion",
-            support_annotations: "com.android.support:support-annotations:$supportVersion",
+            annotations        : "androidx.annotation:annotation:1.0.0",
             rxjava             : "io.reactivex.rxjava2:rxjava:$rxJavaVersion",
             rxandroid          : 'io.reactivex.rxjava2:rxandroid:2.0.2',
             rxrelay            : 'com.jakewharton.rxrelay2:rxrelay:2.1.0',

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,7 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=dariuszseweryn
 POM_DEVELOPER_NAME=Dariusz Seweryn
 POM_DEVELOPER_ID2=uKL
-POM_DEVELOPER_NAME2=Paweł Urban
+POM_DEVELOPER_NAME2=Paweł Urban
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java b/...xandroidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleClientMock.java
@@ -3,8 +3,8 @@
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.RxBleClient;
 import com.polidea.rxandroidble2.RxBleDevice;

diff --git a/...roidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMock.java b/...roidble/src/main/java/com/polidea/rxandroidble2/mockrxandroidble/RxBleConnectionMock.java
@@ -2,7 +2,7 @@
 
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.polidea.rxandroidble2.NotificationSetupMode;

diff --git a/rxandroidble/build.gradle b/rxandroidble/build.gradle
@@ -48,7 +48,7 @@ androidGroovy {
 
 dependencies {
     api rootProject.ext.libs.rxjava
-    api rootProject.ext.libs.support_annotations
+    api rootProject.ext.libs.annotations
     implementation rootProject.ext.libs.rxrelay
     implementation project(path: ':dagger-library-shadow', transitive: false, configuration: 'shadow')
     annotationProcessor project(path: ':dagger-compiler-shadow', transitive: false, configuration: 'shadow')

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/ClientComponent.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/ClientComponent.java
@@ -9,8 +9,8 @@
 import android.content.pm.PackageManager;
 import android.location.LocationManager;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 import com.polidea.rxandroidble2.helpers.LocationServicesOkObservable;
 import com.polidea.rxandroidble2.internal.DeviceComponent;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleAdapterStateObservable.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleAdapterStateObservable.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import bleshadow.javax.inject.Inject;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClient.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClient.java
@@ -1,8 +1,8 @@
 package com.polidea.rxandroidble2;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.internal.RxBleLog;
 import com.polidea.rxandroidble2.scan.BackgroundScanner;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClientImpl.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleClientImpl.java
@@ -1,8 +1,8 @@
 package com.polidea.rxandroidble2;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.RxBleAdapterStateObservable.BleAdapterState;
 import com.polidea.rxandroidble2.exceptions.BleScanException;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleConnection.java
@@ -4,10 +4,10 @@
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import com.polidea.rxandroidble2.exceptions.BleCannotSetCharacteristicNotificationException;
 import com.polidea.rxandroidble2.exceptions.BleCharacteristicNotFoundException;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleCustomOperation.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleCustomOperation.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2;
 
 import android.bluetooth.BluetoothGatt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback;
 import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDevice.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDevice.java
@@ -3,8 +3,8 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGattCallback;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.exceptions.BleAlreadyConnectedException;
 import com.polidea.rxandroidble2.exceptions.BleDisconnectedException;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDeviceServices.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleDeviceServices.java
@@ -3,7 +3,7 @@
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.exceptions.BleCharacteristicNotFoundException;
 import com.polidea.rxandroidble2.exceptions.BleDescriptorNotFoundException;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleRadioOperationCustom.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/RxBleRadioOperationCustom.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2;
 
 import android.bluetooth.BluetoothGatt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.internal.connection.RxBleGattCallback;
 import com.polidea.rxandroidble2.internal.serialization.ConnectionOperationQueue;

diff --git a/...com/polidea/rxandroidble2/exceptions/BleCannotSetCharacteristicNotificationException.java b/...com/polidea/rxandroidble2/exceptions/BleCannotSetCharacteristicNotificationException.java
@@ -3,8 +3,8 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.IntDef;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.IntDef;
+import androidx.annotation.RestrictTo;
 import com.polidea.rxandroidble2.NotificationSetupMode;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...droidble/src/main/java/com/polidea/rxandroidble2/exceptions/BleDisconnectedException.java b/...droidble/src/main/java/com/polidea/rxandroidble2/exceptions/BleDisconnectedException.java
@@ -1,8 +1,8 @@
 package com.polidea.rxandroidble2.exceptions;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 import com.polidea.rxandroidble2.utils.GattStatusParser;
 

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/exceptions/BleGattException.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/exceptions/BleGattException.java
@@ -2,8 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothGatt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.utils.GattStatusParser;
 

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/exceptions/BleScanException.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/exceptions/BleScanException.java
@@ -1,9 +1,9 @@
 package com.polidea.rxandroidble2.exceptions;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Date;

diff --git a/...idble/src/main/java/com/polidea/rxandroidble2/helpers/AdvertisedServiceUUIDExtractor.java b/...idble/src/main/java/com/polidea/rxandroidble2/helpers/AdvertisedServiceUUIDExtractor.java
@@ -1,8 +1,8 @@
 package com.polidea.rxandroidble2.helpers;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservable.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ByteArrayBatchObservable.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.helpers;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.reactivestreams.Subscriber;
 

diff --git a/...roidble/src/main/java/com/polidea/rxandroidble2/helpers/LocationServicesOkObservable.java b/...roidble/src/main/java/com/polidea/rxandroidble2/helpers/LocationServicesOkObservable.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.helpers;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.ClientComponent;
 import com.polidea.rxandroidble2.DaggerClientComponent;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ValueInterpreter.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/helpers/ValueInterpreter.java
@@ -1,9 +1,9 @@
 package com.polidea.rxandroidble2.helpers;
 
 
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 import com.polidea.rxandroidble2.internal.RxBleLog;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...oidble/src/main/java/com/polidea/rxandroidble2/internal/BleIllegalOperationException.java b/...oidble/src/main/java/com/polidea/rxandroidble2/internal/BleIllegalOperationException.java
@@ -1,6 +1,6 @@
 package com.polidea.rxandroidble2.internal;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import java.util.UUID;
 

diff --git a/...src/main/java/com/polidea/rxandroidble2/internal/BluetoothGattCharacteristicProperty.java b/...src/main/java/com/polidea/rxandroidble2/internal/BluetoothGattCharacteristicProperty.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal;
 
 import android.bluetooth.BluetoothGattCharacteristic;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/QueueOperation.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/QueueOperation.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal;
 
 import android.os.DeadObjectException;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.exceptions.BleException;
 import com.polidea.rxandroidble2.internal.operations.Operation;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleDeviceImpl.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleDeviceImpl.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.jakewharton.rxrelay2.BehaviorRelay;
 import com.polidea.rxandroidble2.ConnectionSetup;

diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleLog.java b/rxandroidble/src/main/java/com/polidea/rxandroidble2/internal/RxBleLog.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.lang.annotation.Retention;

diff --git a/...droidble/src/main/java/com/polidea/rxandroidble2/internal/cache/DeviceComponentCache.java b/...droidble/src/main/java/com/polidea/rxandroidble2/internal/cache/DeviceComponentCache.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal.cache;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.ClientScope;
 import com.polidea.rxandroidble2.internal.DeviceComponent;

diff --git a/...le/src/main/java/com/polidea/rxandroidble2/internal/connection/BluetoothGattProvider.java b/...le/src/main/java/com/polidea/rxandroidble2/internal/connection/BluetoothGattProvider.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal.connection;
 
 import android.bluetooth.BluetoothGatt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.atomic.AtomicReference;
 

diff --git a/...src/main/java/com/polidea/rxandroidble2/internal/connection/ConstantPayloadSizeLimit.java b/...src/main/java/com/polidea/rxandroidble2/internal/connection/ConstantPayloadSizeLimit.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal.connection;
 
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 class ConstantPayloadSizeLimit implements PayloadSizeLimitProvider {

diff --git a/.../src/main/java/com/polidea/rxandroidble2/internal/connection/IllegalOperationHandler.java b/.../src/main/java/com/polidea/rxandroidble2/internal/connection/IllegalOperationHandler.java
@@ -2,7 +2,7 @@
 
 
 import android.bluetooth.BluetoothGattCharacteristic;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.polidea.rxandroidble2.internal.BluetoothGattCharacteristicProperty;
 import com.polidea.rxandroidble2.internal.BleIllegalOperationException;

diff --git a/...ain/java/com/polidea/rxandroidble2/internal/connection/LongWriteOperationBuilderImpl.java b/...ain/java/com/polidea/rxandroidble2/internal/connection/LongWriteOperationBuilderImpl.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal.connection;
 
 import android.bluetooth.BluetoothGattCharacteristic;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.RxBleConnection;
 import com.polidea.rxandroidble2.internal.operations.OperationsProvider;

diff --git a/...src/main/java/com/polidea/rxandroidble2/internal/connection/MtuBasedPayloadSizeLimit.java b/...src/main/java/com/polidea/rxandroidble2/internal/connection/MtuBasedPayloadSizeLimit.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal.connection;
 
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import com.polidea.rxandroidble2.RxBleConnection;
 

diff --git a/.../java/com/polidea/rxandroidble2/internal/connection/NotificationAndIndicationManager.java b/.../java/com/polidea/rxandroidble2/internal/connection/NotificationAndIndicationManager.java
@@ -5,7 +5,7 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.ClientComponent;
 import com.polidea.rxandroidble2.NotificationSetupMode;

diff --git a/...src/main/java/com/polidea/rxandroidble2/internal/connection/PayloadSizeLimitProvider.java b/...src/main/java/com/polidea/rxandroidble2/internal/connection/PayloadSizeLimitProvider.java
@@ -1,7 +1,7 @@
 package com.polidea.rxandroidble2.internal.connection;
 
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public interface PayloadSizeLimitProvider {

diff --git a/...dble/src/main/java/com/polidea/rxandroidble2/internal/connection/RxBleConnectionImpl.java b/...dble/src/main/java/com/polidea/rxandroidble2/internal/connection/RxBleConnectionImpl.java
@@ -5,8 +5,8 @@
 import android.bluetooth.BluetoothGattDescriptor;
 import android.os.Build;
 import android.os.DeadObjectException;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import com.polidea.rxandroidble2.ClientComponent;
 import com.polidea.rxandroidble2.NotificationSetupMode;

diff --git a/.../src/main/java/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManager.java b/.../src/main/java/com/polidea/rxandroidble2/internal/connection/ServiceDiscoveryManager.java
@@ -3,7 +3,7 @@
 
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattService;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.RxBleDeviceServices;
 import com.polidea.rxandroidble2.internal.operations.OperationsProvider;

diff --git a/.../java/com/polidea/rxandroidble2/internal/operations/CharacteristicLongWriteOperation.java b/.../java/com/polidea/rxandroidble2/internal/operations/CharacteristicLongWriteOperation.java
@@ -3,7 +3,7 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.os.DeadObjectException;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.ClientComponent;
 import com.polidea.rxandroidble2.RxBleConnection.WriteOperationAckStrategy;

diff --git a/...roidble/src/main/java/com/polidea/rxandroidble2/internal/operations/ConnectOperation.java b/...roidble/src/main/java/com/polidea/rxandroidble2/internal/operations/ConnectOperation.java
@@ -3,7 +3,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.os.DeadObjectException;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.polidea.rxandroidble2.RxBleConnection;
 import com.polidea.rxandroidble2.exceptions.BleDisconnectedException;