diff --git a/android/.idea/caches/build_file_checksums.ser b/android/.idea/caches/build_file_checksums.ser index 3f12ad44..118c2ce5 100644 Binary files a/android/.idea/caches/build_file_checksums.ser and b/android/.idea/caches/build_file_checksums.ser differ diff --git a/android/.idea/caches/gradle_models.ser b/android/.idea/caches/gradle_models.ser new file mode 100644 index 00000000..23c9acaa Binary files /dev/null and b/android/.idea/caches/gradle_models.ser differ diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml index 47bd81ff..2996d531 100644 --- a/android/.idea/gradle.xml +++ b/android/.idea/gradle.xml @@ -3,13 +3,11 @@ 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;