androidx upgrade

Author: bosborn

CHANGELOG.md

@@ -9,6 +9,7 @@ Adheres to [Semantic Versioning](http://semver.org/).
 * geopackage-android-map version 3.2.0
 * Feature Style support
 * Hex Color support
+* Upgrade to AndroidX support libraries
 * gradle plugin updated to 3.3.2
 * gradle version 4.10.1
 

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

mapcache/build.gradle

@@ -42,18 +42,18 @@ android {
 
 task androidAppVersion {
     doLast {
-        com.android.build.gradle.AppExtension appExt = project.extensions.android;
+        com.android.build.gradle.AppExtension appExt = project.extensions.android
         println "versionCode: ${appExt.defaultConfig.applicationId}@${appExt.defaultConfig.versionCode}"
         println "versionName: ${appExt.defaultConfig.applicationId}@${appExt.defaultConfig.versionName}"
     }
 }
 
 dependencies {
-    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'androidx.appcompat:appcompat:1.0.2'
     api 'mil.nga.geopackage.map:geopackage-android-map:3.2.0' // comment out to build locally
     //api project(':geopackage-map') // uncomment me to build locally
-    api 'com.android.support:multidex:1.0.3'
-    testImplementation 'com.android.support:multidex:1.0.3'
+    api 'androidx.multidex:multidex:2.0.1'
+    testImplementation 'androidx.multidex:multidex:2.0.1'
 }
 
 configure extensions.android, {

mapcache/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
     <application
         android:allowBackup="false"
         android:fullBackupOnly="false"
-        android:name="android.support.multidex.MultiDexApplication"
+        android:name="androidx.multidex.MultiDexApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
@@ -59,7 +59,7 @@
         </activity>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="mil.nga.mapcache.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true" >

mapcache/src/main/java/mil/nga/mapcache/GeoPackageManagerFragment.java

@@ -22,10 +22,10 @@
 import android.os.PowerManager;
 import android.provider.DocumentsContract.Document;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.appcompat.app.AlertDialog;
 import android.text.InputFilter;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;

mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java

@@ -17,9 +17,9 @@
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
 import android.text.InputType;
 import android.util.Log;
 import android.util.TypedValue;

mapcache/src/main/java/mil/nga/mapcache/MainActivity.java

@@ -8,7 +8,7 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.view.Menu;
 import android.view.MenuItem;
 

mapcache/src/main/java/mil/nga/mapcache/NavigationDrawerFragment.java

@@ -5,9 +5,9 @@
 import android.app.Fragment;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.legacy.app.ActionBarDrawerToggle;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

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

@@ -1,5 +1,5 @@
 <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
@@ -48,4 +48,4 @@
         android:layout_gravity="start"
         tools:layout="@layout/fragment_navigation_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>