Skip to content
This repository was archived by the owner on Aug 16, 2022. It is now read-only.

Commit b4be22a

Browse files
philips77philips77
committed
Migration to AndroidX
1 parent 82287c2 commit b4be22a

File tree

124 files changed

+187
-185
lines changed

Some content is hidden

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

124 files changed

+187
-185
lines changed

‎ble-common/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ android {
3939
versionCode 25
4040
versionName "2.0.5"
4141

42-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
42+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4343
}
4444

4545
buildTypes {
@@ -57,11 +57,11 @@ android {
5757

5858
dependencies {
5959
// Import the BLE Library
60-
api 'no.nordicsemi.android:ble:2.0.5'
60+
api 'no.nordicsemi.android:ble:2.1.0'
6161

6262
testImplementation 'junit:junit:4.12'
63-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
64-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
63+
androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
64+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
6565
}
6666

6767
/*

‎ble-common/src/androidTest/java/no/nordicsemi/android/ble/common/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
package no.nordicsemi.android.ble.common;
2424

2525
import android.content.Context;
26-
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.InstrumentationRegistry;
27+
import androidx.test.runner.AndroidJUnit4;
2828

2929
import org.junit.Test;
3030
import org.junit.runner.RunWith;

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/DSTOffsetDataCallback.java

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

2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
27+
import androidx.annotation.NonNull;
28+
import androidx.annotation.Nullable;
2929

3030
import no.nordicsemi.android.ble.callback.profile.ProfileReadResponse;
3131
import no.nordicsemi.android.ble.common.profile.DSTOffsetCallback;

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/DSTOffsetResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
28-
import android.support.annotation.NonNull;
28+
import androidx.annotation.NonNull;
2929

3030
import no.nordicsemi.android.ble.exception.InvalidDataException;
3131
import no.nordicsemi.android.ble.exception.RequestFailedException;

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/DateTimeDataCallback.java

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

2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
27+
import androidx.annotation.NonNull;
28+
import androidx.annotation.Nullable;
2929

3030
import java.util.Calendar;
3131

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/DateTimeResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
28-
import android.support.annotation.NonNull;
28+
import androidx.annotation.NonNull;
2929

3030
import java.util.Calendar;
3131

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/RecordAccessControlPointDataCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
27-
import android.support.annotation.NonNull;
27+
import androidx.annotation.NonNull;
2828

2929
import no.nordicsemi.android.ble.callback.profile.ProfileReadResponse;
3030
import no.nordicsemi.android.ble.common.profile.RecordAccessControlPointCallback;

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/RecordAccessControlPointResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
28-
import android.support.annotation.NonNull;
28+
import androidx.annotation.NonNull;
2929

3030
import no.nordicsemi.android.ble.exception.InvalidDataException;
3131
import no.nordicsemi.android.ble.exception.RequestFailedException;

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/TimeZoneDataCallback.java

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

2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
27+
import androidx.annotation.NonNull;
28+
import androidx.annotation.Nullable;
2929

3030
import no.nordicsemi.android.ble.callback.profile.ProfileReadResponse;
3131
import no.nordicsemi.android.ble.common.profile.TimeZoneCallback;

‎ble-common/src/main/java/no/nordicsemi/android/ble/common/callback/TimeZoneResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.bluetooth.BluetoothDevice;
2626
import android.os.Parcel;
2727
import android.os.Parcelable;
28-
import android.support.annotation.NonNull;
28+
import androidx.annotation.NonNull;
2929

3030
import no.nordicsemi.android.ble.exception.InvalidDataException;
3131
import no.nordicsemi.android.ble.exception.RequestFailedException;

0 commit comments

Comments
 (0)