Migration to Android X (#69)

NordicSemiconductor · Feb 1, 2019 · 107f969 · 107f969
1 parent 3db87a8
commit 107f969
Show file tree

Hide file tree

Showing 60 changed files with 144 additions and 137 deletions.
diff --git a/ble/build.gradle b/ble/build.gradle
@@ -39,7 +39,7 @@ android {
         versionCode 25
         versionName "2.0.5"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -57,11 +57,11 @@ android {
 
 dependencies {
     //noinspection GradleDependency
-    api 'com.android.support:support-annotations:28.0.0'
+    api 'androidx.annotation:annotation:1.0.1'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 /*

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/BleManager.java b/ble/src/main/java/no/nordicsemi/android/ble/BleManager.java
@@ -38,13 +38,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StringRes;
 import android.util.Log;
 
 import java.lang.annotation.Retention;
@@ -55,6 +48,13 @@
 import java.util.LinkedList;
 import java.util.UUID;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StringRes;
 import no.nordicsemi.android.ble.annotation.ConnectionPriority;
 import no.nordicsemi.android.ble.annotation.ConnectionState;
 import no.nordicsemi.android.ble.annotation.PhyMask;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/BleManagerCallbacks.java b/ble/src/main/java/no/nordicsemi/android/ble/BleManagerCallbacks.java
@@ -24,8 +24,9 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCallback;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 
 // DO NOT EDIT THIS FILE UNLESS NECESSARY!
 /**

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/ConnectRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/ConnectRequest.java
@@ -27,9 +27,9 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCallback;
 import android.content.Context;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.annotation.PhyMask;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/ConnectionPriorityRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/ConnectionPriorityRequest.java
@@ -24,10 +24,10 @@
 
 import android.bluetooth.BluetoothDevice;
 import android.os.Build;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import no.nordicsemi.android.ble.annotation.ConnectionPriority;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.ConnectionPriorityCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/DisconnectRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/DisconnectRequest.java
@@ -22,9 +22,8 @@
 
 package no.nordicsemi.android.ble;
 
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.InvalidRequestCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/MainThreadBluetoothGattCallback.java b/ble/src/main/java/no/nordicsemi/android/ble/MainThreadBluetoothGattCallback.java
@@ -29,12 +29,12 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.IntRange;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import no.nordicsemi.android.ble.annotation.ConnectionState;
 import no.nordicsemi.android.ble.annotation.PhyValue;
 

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/MtuRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/MtuRequest.java
@@ -23,9 +23,9 @@
 package no.nordicsemi.android.ble;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.InvalidRequestCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/PhyRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/PhyRequest.java
@@ -23,8 +23,8 @@
 package no.nordicsemi.android.ble;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.annotation.PhyMask;
 import no.nordicsemi.android.ble.annotation.PhyOption;
 import no.nordicsemi.android.ble.annotation.PhyValue;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/ReadRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/ReadRequest.java
@@ -26,9 +26,9 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.DataReceivedCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/ReadRssiRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/ReadRssiRequest.java
@@ -23,9 +23,9 @@
 package no.nordicsemi.android.ble;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.InvalidRequestCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/ReliableWriteRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/ReliableWriteRequest.java
@@ -22,8 +22,7 @@
 
 package no.nordicsemi.android.ble;
 
-import android.support.annotation.NonNull;
-
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.InvalidRequestCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/Request.java b/ble/src/main/java/no/nordicsemi/android/ble/Request.java
@@ -29,10 +29,10 @@
 import android.bluetooth.BluetoothGattDescriptor;
 import android.os.ConditionVariable;
 import android.os.Looper;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.annotation.ConnectionPriority;
 import no.nordicsemi.android.ble.annotation.PhyMask;
 import no.nordicsemi.android.ble.annotation.PhyOption;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/RequestQueue.java b/ble/src/main/java/no/nordicsemi/android/ble/RequestQueue.java
@@ -22,13 +22,12 @@
 
 package no.nordicsemi.android.ble;
 
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.util.LinkedList;
 import java.util.Queue;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.InvalidRequestCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/SimpleRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/SimpleRequest.java
@@ -25,9 +25,9 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.SuccessCallback;
 import no.nordicsemi.android.ble.exception.BluetoothDisabledException;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/SimpleValueRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/SimpleValueRequest.java
@@ -24,9 +24,9 @@
 
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.SuccessCallback;
 import no.nordicsemi.android.ble.exception.BluetoothDisabledException;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/SleepRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/SleepRequest.java
@@ -22,9 +22,8 @@
 
 package no.nordicsemi.android.ble;
 
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.InvalidRequestCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/TimeoutHandler.java b/ble/src/main/java/no/nordicsemi/android/ble/TimeoutHandler.java
@@ -1,6 +1,6 @@
 package no.nordicsemi.android.ble;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 abstract class TimeoutHandler {
 

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/TimeoutableRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/TimeoutableRequest.java
@@ -5,10 +5,10 @@
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.os.Handler;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.SuccessCallback;
 import no.nordicsemi.android.ble.exception.BluetoothDisabledException;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/TimeoutableValueRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/TimeoutableValueRequest.java
@@ -24,10 +24,10 @@
 
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.FailCallback;
 import no.nordicsemi.android.ble.callback.SuccessCallback;
 import no.nordicsemi.android.ble.exception.BluetoothDisabledException;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/ValueChangedCallback.java b/ble/src/main/java/no/nordicsemi/android/ble/ValueChangedCallback.java
@@ -23,9 +23,9 @@
 package no.nordicsemi.android.ble;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.DataReceivedCallback;
 import no.nordicsemi.android.ble.callback.ReadProgressCallback;
 import no.nordicsemi.android.ble.data.Data;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/WaitForValueChangedRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/WaitForValueChangedRequest.java
@@ -25,10 +25,10 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.DataReceivedCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/WriteRequest.java b/ble/src/main/java/no/nordicsemi/android/ble/WriteRequest.java
@@ -26,12 +26,12 @@
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.Arrays;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import no.nordicsemi.android.ble.annotation.WriteType;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.DataSentCallback;

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/annotation/ConnectionPriority.java b/ble/src/main/java/no/nordicsemi/android/ble/annotation/ConnectionPriority.java
@@ -22,11 +22,10 @@
 
 package no.nordicsemi.android.ble.annotation;
 
-import android.support.annotation.IntDef;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
 import no.nordicsemi.android.ble.ConnectionPriorityRequest;
 
 @Retention(RetentionPolicy.SOURCE)

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/annotation/ConnectionState.java b/ble/src/main/java/no/nordicsemi/android/ble/annotation/ConnectionState.java
@@ -23,11 +23,12 @@
 package no.nordicsemi.android.ble.annotation;
 
 import android.bluetooth.BluetoothProfile;
-import android.support.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
+
 @Retention(RetentionPolicy.SOURCE)
 @IntDef(value = {
 		BluetoothProfile.STATE_DISCONNECTED,

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/annotation/PhyMask.java b/ble/src/main/java/no/nordicsemi/android/ble/annotation/PhyMask.java
@@ -22,11 +22,10 @@
 
 package no.nordicsemi.android.ble.annotation;
 
-import android.support.annotation.IntDef;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
 import no.nordicsemi.android.ble.PhyRequest;
 
 @Retention(RetentionPolicy.SOURCE)

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/annotation/PhyOption.java b/ble/src/main/java/no/nordicsemi/android/ble/annotation/PhyOption.java
@@ -22,11 +22,10 @@
 
 package no.nordicsemi.android.ble.annotation;
 
-import android.support.annotation.IntDef;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
 import no.nordicsemi.android.ble.PhyRequest;
 
 @Retention(RetentionPolicy.SOURCE)

diff --git a/ble/src/main/java/no/nordicsemi/android/ble/annotation/PhyValue.java b/ble/src/main/java/no/nordicsemi/android/ble/annotation/PhyValue.java
@@ -22,11 +22,10 @@
 
 package no.nordicsemi.android.ble.annotation;
 
-import android.support.annotation.IntDef;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
 import no.nordicsemi.android.ble.callback.PhyCallback;
 
 @Retention(RetentionPolicy.SOURCE)