feat!(android): Migrate to AndroidX (#119)

* feat!(android): migrate ASL to AndroidX * feat!(android): swap framework support-v13 w/ androidx.core * feat!(android): force AndroidXEnabled to true * feat!(android): bump androidx.core:core@1.6.+ * doc(android): add androidx core version Co-authored-by: Bojan Cvjetkovic <bojan.cvjetkovic@arz.at>
havesource · Aug 27, 2021 · b910146 · b910146
1 parent 82dff88
commit b910146
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
@@ -119,7 +119,7 @@ To make the two work together, you need to migrate your GCM project from Google
   "cordova": {
     "plugins": {
       "@havesource/cordova-plugin-push": {
-        "ANDROID_SUPPORT_V13_VERSION": "28.0.0",
+        "ANDROIDX_CORE_VERSION": "1.6.+",
         "FCM_VERSION": "18.+"
       }
     },

diff --git a/plugin.xml b/plugin.xml
@@ -58,14 +58,15 @@
     </config-file>
 
     <config-file target="config.xml" parent="/*">
+      <preference name="AndroidXEnabled" value="true" />
       <preference name="GradlePluginGoogleServicesEnabled" value="true" />
       <preference name="GradlePluginGoogleServicesVersion" value="4.2.0" />
     </config-file>
 
-    <preference name="ANDROID_SUPPORT_V13_VERSION" default="28.0.0"/>
+    <preference name="ANDROIDX_CORE_VERSION" default="1.6.+"/>
     <preference name="FCM_VERSION" default="18.+"/>
 
-    <framework src="com.android.support:support-v13:$ANDROID_SUPPORT_V13_VERSION"/>
+    <framework src="androidx.core:core:$ANDROIDX_CORE_VERSION" />
     <framework src="me.leolin:ShortcutBadger:1.1.17@aar"/>
     <framework src="com.google.firebase:firebase-messaging:$FCM_VERSION"/>
 

diff --git a/src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java b/src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java
@@ -6,7 +6,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 public class BackgroundActionButtonHandler extends BroadcastReceiver implements PushConstants {
   private static String LOG_TAG = "Push_BGActionButton";

diff --git a/src/android/com/adobe/phonegap/push/BackgroundHandlerActivity.java b/src/android/com/adobe/phonegap/push/BackgroundHandlerActivity.java
@@ -7,7 +7,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 public class BackgroundHandlerActivity extends Activity implements PushConstants {
   private static String LOG_TAG = "Push_BackgroundHandlerActivity";

diff --git a/src/android/com/adobe/phonegap/push/FCMService.java b/src/android/com/adobe/phonegap/push/FCMService.java
@@ -23,9 +23,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.WearableExtender;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.WearableExtender;
+import androidx.core.app.RemoteInput;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;

diff --git a/src/android/com/adobe/phonegap/push/PushHandlerActivity.java b/src/android/com/adobe/phonegap/push/PushHandlerActivity.java
@@ -7,7 +7,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 
 public class PushHandlerActivity extends Activity implements PushConstants {

diff --git a/src/android/com/adobe/phonegap/push/PushPlugin.java b/src/android/com/adobe/phonegap/push/PushPlugin.java
@@ -12,8 +12,8 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.util.Log;
 
 import com.google.firebase.iid.FirebaseInstanceId;