migrate to android x

app/build.gradle

@@ -26,8 +26,8 @@ android {
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'junit:junit:4.12'
-    api 'com.android.support:appcompat-v7:28.0.0-rc01'
-    api 'com.android.support:design:28.0.0-rc01'
+    api 'androidx.appcompat:appcompat:1.0.0-beta01'
+    api 'com.google.android.material:material:1.0.0-beta01'
     api project(':libaums')
     api project(':httpserver')
     api project(':storageprovider')

app/src/main/AndroidManifest.xml

@@ -64,7 +64,7 @@
         </provider>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/github/mjdev/libaums/usbfileman/DrawerListAdapter.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.hardware.usb.UsbDevice;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ArrayAdapter;
 
 import com.github.mjdev.libaums.UsbMassStorageDevice;

app/src/main/java/com/github/mjdev/libaums/usbfileman/LibAumsTest.java

@@ -8,7 +8,7 @@
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import com.github.mjdev.libaums.UsbMassStorageDevice;

app/src/main/java/com/github/mjdev/libaums/usbfileman/MainActivity.java

@@ -54,15 +54,15 @@
 import android.os.Environment;
 import android.os.IBinder;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
-import android.support.v4.provider.DocumentFile;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.documentfile.provider.DocumentFile;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -727,7 +727,7 @@ private void discoverDevice() {
 
 		if (massStorageDevices.length == 0) {
 			Log.w(TAG, "no device found!");
-			android.support.v7.app.ActionBar actionBar = getSupportActionBar();
+			androidx.appcompat.app.ActionBar actionBar = getSupportActionBar();
 			actionBar.setTitle("No device");
 			listView.setAdapter(null);
 			return;

app/src/main/res/layout/activity_main.xml

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 -->
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -37,4 +37,4 @@
         android:choiceMode="singleChoice"
         android:divider="@android:color/transparent"
         android:dividerHeight="0dp" />
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

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

httpserver/build.gradle

@@ -40,7 +40,7 @@ dependencies {
     api 'com.koushikdutta.async:androidasync:2.+'
 
     api fileTree(include: ['*.jar'], dir: 'libs')
-    api 'com.android.support:support-annotations:27.1.1'
+    api 'androidx.annotation:annotation:1.0.0-beta01'
     api project(':libaums')
 }
 

httpserver/src/main/java/com/github/mjdev/libaums/server/http/UsbFileHttpServer.java

@@ -17,7 +17,7 @@
 
 package com.github.mjdev.libaums.server.http;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import android.util.LruCache;
 

httpserver/src/main/java/com/github/mjdev/libaums/server/http/UsbFileHttpServerService.java

@@ -22,7 +22,7 @@
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.github.mjdev.libaums.fs.UsbFile;

javafs/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -32,7 +32,7 @@ dependencies {
     api 'com.github.magnusja:java-fs:0.1.3'
 
     api fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'

javafs/src/main/java/com/github/magnusja/libaums/javafs/wrapper/fs/UsbFileWrapper.java

@@ -1,7 +1,7 @@
 package com.github.magnusja.libaums.javafs.wrapper.fs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.github.mjdev.libaums.fs.AbstractUsbFile;

libaums/build.gradle

@@ -62,8 +62,8 @@ dependencies {
     testImplementation 'org.xenei:junit-contracts:0.1.7'
     testImplementation 'org.mockito:mockito-core:2.7.22'
 
-    api 'com.android.support:support-annotations:27.1.1'
-    javadocDeps 'com.android.support:support-annotations:27.1.1'
+    api 'androidx.annotation:annotation:1.0.0-beta01'
+    javadocDeps 'androidx.annotation:annotation:1.0.0-beta01'
 }
 
 task bintray {

libaums/src/main/java/com/github/mjdev/libaums/fs/FileSystemCreator.java

@@ -1,6 +1,6 @@
 package com.github.mjdev.libaums.fs;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.github.mjdev.libaums.driver.BlockDeviceDriver;
 import com.github.mjdev.libaums.partition.PartitionTableEntry;

libaums/src/main/java/com/github/mjdev/libaums/fs/UsbFile.java

@@ -17,8 +17,8 @@
 
 package com.github.mjdev.libaums.fs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.Closeable;
 import java.io.IOException;

libaums/src/main/java/com/github/mjdev/libaums/fs/UsbFileOutputStream.java

@@ -18,7 +18,7 @@
 
 package com.github.mjdev.libaums.fs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 import java.io.OutputStream;

libaums/src/main/java/com/github/mjdev/libaums/partition/PartitionTableFactory.java

@@ -17,17 +17,14 @@
 
 package com.github.mjdev.libaums.partition;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.github.mjdev.libaums.driver.BlockDeviceDriver;
-import com.github.mjdev.libaums.partition.fs.FileSystemPartitionTable;
 import com.github.mjdev.libaums.partition.fs.FileSystemPartitionTableCreator;
-import com.github.mjdev.libaums.partition.mbr.MasterBootRecord;
 import com.github.mjdev.libaums.partition.mbr.MasterBootRecordCreator;
 
 /**

libaums/src/main/java/com/github/mjdev/libaums/partition/fs/FileSystemPartitionTableCreator.java

@@ -1,10 +1,9 @@
 package com.github.mjdev.libaums.partition.fs;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.github.mjdev.libaums.driver.BlockDeviceDriver;
 import com.github.mjdev.libaums.driver.ByteBlockDevice;
-import com.github.mjdev.libaums.fs.FileSystem;
 import com.github.mjdev.libaums.fs.FileSystemFactory;
 import com.github.mjdev.libaums.partition.PartitionTable;
 import com.github.mjdev.libaums.partition.PartitionTableFactory;

libaums/src/main/java/com/github/mjdev/libaums/partition/mbr/MasterBootRecordCreator.java

@@ -1,6 +1,6 @@
 package com.github.mjdev.libaums.partition.mbr;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.github.mjdev.libaums.driver.BlockDeviceDriver;
 import com.github.mjdev.libaums.partition.PartitionTable;