Merge pull request EddyVerbruggen#173 from Rareloop/migrate-to-androidx

Fix android build by migrating androidx modules

Author: EddyVerbruggen

plugin.xml

@@ -45,7 +45,7 @@
       </feature>
     </config-file>
     <framework src="build/android/SafariViewController-java18.gradle" custom="true" type="gradleReference" />
-    <framework src="com.android.support:customtabs:23.2.0" />
+    <framework src="androidx.browser:browser:1.3.0" />
 
     <source-file src="src/android/ChromeCustomTabPlugin.java"             target-dir="src/com/customtabplugin" />
     <source-file src="src/android/helpers/CustomTabServiceHelper.java"    target-dir="src/com/customtabplugin" />

src/android/ChromeCustomTabPlugin.java

@@ -7,12 +7,12 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.ColorInt;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.customtabs.CustomTabsSession;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
+import androidx.annotation.ColorInt;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsSession;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import org.apache.cordova.CallbackContext;

src/android/helpers/CustomTabServiceHelper.java

@@ -7,10 +7,10 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.customtabs.CustomTabsServiceConnection;
-import android.support.customtabs.CustomTabsSession;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsSession;
 import android.text.TextUtils;
 
 import org.chromium.customtabsclient.shared.CustomTabsHelper;

src/android/helpers/ServiceConnection.java

@@ -15,8 +15,8 @@
 package org.chromium.customtabsclient.shared;
 
 import android.content.ComponentName;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
 
 import java.lang.ref.WeakReference;
 

src/android/helpers/ServiceConnectionCallback.java

@@ -14,7 +14,7 @@
 
 package org.chromium.customtabsclient.shared;
 
-import android.support.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsClient;
 
 /**
  * Callback for events when connecting and disconnecting from Custom Tabs Service.