Migration to AndroidX (#169)

dfu/build.gradle

@@ -58,7 +58,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-core-utils:28.0.0'
+    implementation 'androidx.core:core:1.1.0-alpha02'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.annotation:annotation:1.0.1'
     implementation 'com.google.code.gson:gson:2.8.5'
 }
 /*

dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java

@@ -30,7 +30,7 @@ import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 
 import java.io.InputStream;

dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java

@@ -46,8 +46,8 @@ import android.os.Build;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.app.NotificationCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import java.io.ByteArrayInputStream;

dfu/src/main/java/no/nordicsemi/android/dfu/DfuProgressInfo.java

@@ -23,7 +23,7 @@
 package no.nordicsemi.android.dfu;
 
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /* package */ class DfuProgressInfo {
 	interface ProgressListener {

dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceController.java

@@ -24,7 +24,7 @@ package no.nordicsemi.android.dfu;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 /**
  * A controller class allows you to pause, resume or abort the DFU operation in a easy way.

dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceInitiator.java

@@ -33,9 +33,9 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelUuid;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import java.security.InvalidParameterException;
 import java.util.UUID;

dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceListenerHelper.java

@@ -26,7 +26,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import java.util.HashMap;
 import java.util.Locale;

dfu/src/main/java/no/nordicsemi/android/dfu/internal/ArchiveInputStream.java

@@ -22,7 +22,7 @@
 
 package no.nordicsemi.android.dfu.internal;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.google.gson.Gson;

dfu/src/main/java/no/nordicsemi/android/dfu/internal/HexInputStream.java

@@ -22,7 +22,7 @@
 
 package no.nordicsemi.android.dfu.internal;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -327,6 +327,15 @@ public class HexInputStream extends FilterInputStream {
 		return lineSize;
 	}
 
+	@Override
+	public synchronized void mark(final int readlimit) {
+		try {
+			super.mark(in.available());
+		} catch (final IOException e) {
+			// ignore
+		}
+	}
+
 	@Override
 	public synchronized void reset() throws IOException {
 		super.reset();

dfu/src/main/java/no/nordicsemi/android/dfu/internal/scanner/BootloaderScanner.java

@@ -22,7 +22,7 @@
 
 package no.nordicsemi.android.dfu.internal.scanner;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * <p>

gradle.properties

@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true