From 61dc830cb9fa19e47fad8329162cfd7b6dca34be Mon Sep 17 00:00:00 2001
From: Kadi Kraman <kadi.kraman@formidable.com>
Date: Thu, 20 Jun 2019 13:36:40 +0100
Subject: [PATCH] Migrate android.support -> androidx

---
 android/gradle.properties                                | 2 ++
 android/src/main/java/com/rnappauth/RNAppAuthModule.java | 9 ++++-----
 .../src/main/java/com/rnappauth/RNAppAuthPackage.java    | 1 +
 .../com/rnappauth/utils/CustomConnectionBuilder.java     | 2 +-
 android/src/main/java/com/rnappauth/utils/MapUtil.java   | 2 +-
 .../com/rnappauth/utils/UnsafeConnectionBuilder.java     | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 android/gradle.properties

diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 00000000..646c51b9
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/android/src/main/java/com/rnappauth/RNAppAuthModule.java b/android/src/main/java/com/rnappauth/RNAppAuthModule.java
index fb5ae8e8..e40e2c2f 100644
--- a/android/src/main/java/com/rnappauth/RNAppAuthModule.java
+++ b/android/src/main/java/com/rnappauth/RNAppAuthModule.java
@@ -7,11 +7,10 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.customtabs.CustomTabsCallback;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsServiceConnection;
-import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabsCallback;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
 
 import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
diff --git a/android/src/main/java/com/rnappauth/RNAppAuthPackage.java b/android/src/main/java/com/rnappauth/RNAppAuthPackage.java
index e0b7ba89..b49f65c6 100644
--- a/android/src/main/java/com/rnappauth/RNAppAuthPackage.java
+++ b/android/src/main/java/com/rnappauth/RNAppAuthPackage.java
@@ -9,6 +9,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.bridge.JavaScriptModule;
+
 public class RNAppAuthPackage implements ReactPackage {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
diff --git a/android/src/main/java/com/rnappauth/utils/CustomConnectionBuilder.java b/android/src/main/java/com/rnappauth/utils/CustomConnectionBuilder.java
index b96fb75c..dce69df2 100644
--- a/android/src/main/java/com/rnappauth/utils/CustomConnectionBuilder.java
+++ b/android/src/main/java/com/rnappauth/utils/CustomConnectionBuilder.java
@@ -16,7 +16,7 @@
 
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import net.openid.appauth.connectivity.ConnectionBuilder;
 
diff --git a/android/src/main/java/com/rnappauth/utils/MapUtil.java b/android/src/main/java/com/rnappauth/utils/MapUtil.java
index 09914064..7354564e 100644
--- a/android/src/main/java/com/rnappauth/utils/MapUtil.java
+++ b/android/src/main/java/com/rnappauth/utils/MapUtil.java
@@ -1,6 +1,6 @@
 package com.rnappauth.utils;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
diff --git a/android/src/main/java/com/rnappauth/utils/UnsafeConnectionBuilder.java b/android/src/main/java/com/rnappauth/utils/UnsafeConnectionBuilder.java
index a862bacc..d67f2e88 100644
--- a/android/src/main/java/com/rnappauth/utils/UnsafeConnectionBuilder.java
+++ b/android/src/main/java/com/rnappauth/utils/UnsafeConnectionBuilder.java
@@ -17,8 +17,8 @@
 
 import android.annotation.SuppressLint;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import net.openid.appauth.Preconditions;