From 35d7fe850ac173f435f9dee857ef832144e4b440 Mon Sep 17 00:00:00 2001 From: Rex Momoh Date: Mon, 11 Mar 2019 08:14:26 +0100 Subject: [PATCH] upgrade to androidX --- android/.idea/caches/build_file_checksums.ser | Bin 492 -> 488 bytes android/.idea/caches/gradle_models.ser | Bin 0 -> 96863 bytes android/.idea/gradle.xml | 8 ++--- android/.idea/misc.xml | 34 +++--------------- android/.idea/vcs.xml | 6 ++++ android/build.gradle | 8 ++--- android/gradle.properties | 2 ++ .../ChromeCustomTabsActivity.java | 2 +- .../CustomTabActivityHelper.java | 8 ++--- .../ChromeCustomTabs/ServiceConnection.java | 4 +-- .../ServiceConnectionCallback.java | 2 +- .../InAppBrowserActivity.java | 5 ++- .../InAppWebView/InAppWebViewClient.java | 2 +- .../RequestPermissionHandler.java | 6 ++-- 14 files changed, 34 insertions(+), 53 deletions(-) create mode 100644 android/.idea/caches/gradle_models.ser create mode 100644 android/.idea/vcs.xml diff --git a/android/.idea/caches/build_file_checksums.ser b/android/.idea/caches/build_file_checksums.ser index 3f12ad44eed85fd04df432696e66ae933a7e44d3..118c2ce5fe55d70396f8b860dd613222a5ecb7c3 100644 GIT binary patch delta 114 zcmV-&0FD3b1Ly;gmj!8SnSn}?oQMk~FI978a&s?oWq6Z`0X8QLVs&Y3WG-iNVPtG& zb#VZG00sa601)LxV;)zZn^~%n;(8297u#HPc?SlVk8c&E57;Q#;t delta 119 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 H diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml index b0c7b20c..af0bbdde 100644 --- a/android/.idea/misc.xml +++ b/android/.idea/misc.xml @@ -1,35 +1,11 @@ - - - + + + + - + diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/android/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 26af5d43..4c141f0f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,11 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 17 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -36,7 +36,7 @@ android { } dependencies { - implementation 'com.android.support:customtabs:27.1.1' - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.browser:browser:1.0.0-beta01' + implementation 'androidx.appcompat:appcompat:1.0.0-beta01' implementation 'com.squareup.okhttp3:mockwebserver:3.11.0' } diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f68..53ae0ae4 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java index 3f1de9a4..182146b5 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ChromeCustomTabsActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.customtabs.CustomTabsIntent; +import androidx.browser.customtabs.CustomTabsIntent; import com.pichillilorenzo.flutter_inappbrowser.InAppBrowserFlutterPlugin; import com.pichillilorenzo.flutter_inappbrowser.R; diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java index b065cc09..fe010cb1 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/CustomTabActivityHelper.java @@ -3,10 +3,10 @@ package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs; import android.app.Activity; 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 java.util.List; diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java index 76fff521..51cff8c9 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnection.java @@ -1,8 +1,8 @@ package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs; 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; diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java index c5d80b70..9c922362 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/ChromeCustomTabs/ServiceConnectionCallback.java @@ -1,6 +1,6 @@ package com.pichillilorenzo.flutter_inappbrowser.ChromeCustomTabs; -import android.support.customtabs.CustomTabsClient; +import androidx.browser.customtabs.CustomTabsClient; /** * Callback for events when connecting and disconnecting from Custom Tabs Service. diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java index 817f52fa..bc96459d 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowserActivity.java @@ -6,10 +6,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Picture; import android.graphics.drawable.ColorDrawable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java index e8386107..680b546e 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebViewClient.java @@ -5,7 +5,7 @@ import android.graphics.Bitmap; import android.net.Uri; import android.net.http.SslError; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import android.webkit.CookieManager; import android.webkit.CookieSyncManager; diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java index 76147c43..76ccb1f0 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/RequestPermissionHandler.java @@ -2,9 +2,9 @@ package com.pichillilorenzo.flutter_inappbrowser; import android.app.Activity; import android.content.pm.PackageManager; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import java.util.Arrays; import java.util.HashMap;