From 173058981bf1f608fb06eb4bb07b0d0cd72a1e1a Mon Sep 17 00:00:00 2001 From: James Willcox Date: Fri, 18 Sep 2020 22:29:04 +0000 Subject: [PATCH] Bug 1553459 - Migrate to AndroidX r=geckoview-reviewers,agi Differential Revision: https://phabricator.services.mozilla.com/D90711 --- build.gradle | 11 +---------- gradle.properties | 1 + .../api/org/webrtc/Camera1Enumerator.java | 2 +- .../api/org/webrtc/Camera2Capturer.java | 2 +- .../api/org/webrtc/Camera2Enumerator.java | 2 +- .../sdk/android/api/org/webrtc/EglBase.java | 2 +- .../android/api/org/webrtc/JavaI420Buffer.java | 2 +- .../api/org/webrtc/SurfaceTextureHelper.java | 2 +- .../api/org/webrtc/TextureBufferImpl.java | 2 +- .../api/org/webrtc/VideoFrameDrawer.java | 2 +- .../src/java/org/webrtc/Camera2Session.java | 2 +- .../src/java/org/webrtc/CameraCapturer.java | 2 +- .../src/java/org/webrtc/EglBase10Impl.java | 2 +- .../src/java/org/webrtc/EglBase14Impl.java | 3 +-- .../src/java/org/webrtc/GlGenericDrawer.java | 5 +---- .../src/java/org/webrtc/NV21Buffer.java | 2 +- .../src/java/org/webrtc/RefCountDelegate.java | 2 +- mobile/android/config/proguard/proguard.cfg | 18 ------------------ .../messaging_example/app/build.gradle | 6 +++--- .../example/messaging/MainActivity.java | 6 +++--- .../app/src/main/res/layout/activity_main.xml | 4 ++-- .../port_messaging_example/app/build.gradle | 6 +++--- .../example/messaging/MainActivity.java | 6 +++--- .../app/src/main/res/layout/activity_main.xml | 4 ++-- mobile/android/geckoview/api.txt | 8 ++++---- mobile/android/geckoview/build.gradle | 13 ++++++------- .../ContentDelegateMultipleSessionsTest.kt | 2 +- .../geckoview/test/ContentDelegateTest.kt | 2 +- .../mozilla/geckoview/test/GeckoViewTest.kt | 2 +- .../geckoview/test/TestCrashHandler.java | 2 -- .../geckoview/test/TestRunnerActivity.java | 7 ++----- .../mozilla/geckoview/test/WebPushUtils.java | 6 ++---- .../test/rule/GeckoSessionTestRule.java | 4 ++-- .../geckoview/test/util/RuntimeCreator.java | 6 +++--- .../geckoview/test/util/UiThreadUtils.java | 2 +- .../org/mozilla/gecko/EventDispatcher.java | 2 +- .../java/org/mozilla/gecko/GeckoAppShell.java | 6 +++--- .../org/mozilla/gecko/GeckoEditableChild.java | 2 +- .../org/mozilla/gecko/GeckoJavaSampler.java | 4 ++-- .../org/mozilla/gecko/GeckoNetworkManager.java | 4 ++-- .../java/org/mozilla/gecko/GeckoProfile.java | 6 +++--- .../gecko/GeckoSystemStateListener.java | 2 +- .../java/org/mozilla/gecko/GeckoThread.java | 7 +++---- .../main/java/org/mozilla/gecko/MultiMap.java | 4 ++-- .../java/org/mozilla/gecko/PrefsHelper.java | 2 +- .../mozilla/gecko/gfx/GeckoSurfaceTexture.java | 2 +- .../org/mozilla/gecko/gfx/VsyncSource.java | 2 +- .../gecko/media/GeckoPlayerFactory.java | 2 +- .../gecko/media/LollipopAsyncCodec.java | 2 +- .../org/mozilla/gecko/mozglue/NativeZip.java | 2 +- .../org/mozilla/gecko/mozglue/SafeIntent.java | 2 +- .../gecko/process/GeckoProcessManager.java | 8 ++++---- .../gecko/process/ServiceAllocator.java | 2 +- .../mozilla/gecko/process/ServiceUtils.java | 2 +- .../org/mozilla/gecko/util/BitmapUtils.java | 4 ++-- .../mozilla/gecko/util/ContentUriUtils.java | 2 +- .../java/org/mozilla/gecko/util/DateUtil.java | 2 +- .../org/mozilla/gecko/util/DebugConfig.java | 2 +- .../java/org/mozilla/gecko/util/FileUtils.java | 2 +- .../org/mozilla/gecko/util/GeckoBundle.java | 2 +- .../org/mozilla/gecko/util/ImageDecoder.java | 4 ++-- .../org/mozilla/gecko/util/ImageResource.java | 6 +++--- .../org/mozilla/gecko/util/IntentUtils.java | 4 ++-- .../org/mozilla/gecko/util/NetworkUtils.java | 2 +- .../org/mozilla/gecko/util/ProxySelector.java | 2 +- .../org/mozilla/gecko/util/StringUtils.java | 2 +- .../mozilla/gecko/util/XPCOMEventTarget.java | 2 +- .../org/mozilla/geckoview/AllowOrDeny.java | 2 +- .../org/mozilla/geckoview/Autocomplete.java | 10 +++++----- .../java/org/mozilla/geckoview/Autofill.java | 12 ++++++------ .../BasicSelectionActionDelegate.java | 6 +++--- .../geckoview/CompositorController.java | 6 +++--- .../org/mozilla/geckoview/ContentBlocking.java | 10 +++++----- .../geckoview/ContentBlockingController.java | 10 +++++----- .../org/mozilla/geckoview/CrashReporter.java | 4 ++-- .../org/mozilla/geckoview/GeckoDisplay.java | 8 ++++---- .../org/mozilla/geckoview/GeckoEditable.java | 4 ++-- .../geckoview/GeckoFontScaleListener.java | 3 +-- .../geckoview/GeckoInputConnection.java | 2 +- .../mozilla/geckoview/GeckoInputStream.java | 4 ++-- .../org/mozilla/geckoview/GeckoResult.java | 8 ++++---- .../org/mozilla/geckoview/GeckoRuntime.java | 18 +++++++++--------- .../geckoview/GeckoRuntimeSettings.java | 8 ++++---- .../org/mozilla/geckoview/GeckoSession.java | 14 +++++++------- .../mozilla/geckoview/GeckoSessionHandler.java | 2 +- .../geckoview/GeckoSessionSettings.java | 6 +++--- .../org/mozilla/geckoview/GeckoVRManager.java | 2 +- .../java/org/mozilla/geckoview/GeckoView.java | 12 ++++++------ .../mozilla/geckoview/GeckoWebExecutor.java | 6 +++--- .../main/java/org/mozilla/geckoview/Image.java | 4 ++-- .../org/mozilla/geckoview/MediaElement.java | 10 +++++----- .../org/mozilla/geckoview/MediaSession.java | 10 +++++----- .../geckoview/OverscrollEdgeEffect.java | 6 +++--- .../mozilla/geckoview/PanZoomController.java | 6 +++--- .../mozilla/geckoview/ProfilerController.java | 6 +++--- .../org/mozilla/geckoview/RuntimeSettings.java | 8 ++++---- .../mozilla/geckoview/RuntimeTelemetry.java | 4 ++-- .../org/mozilla/geckoview/ScreenLength.java | 6 +++--- .../geckoview/SessionAccessibility.java | 6 +++--- .../org/mozilla/geckoview/SessionFinder.java | 6 +++--- .../mozilla/geckoview/SessionTextInput.java | 8 ++++---- .../mozilla/geckoview/SlowScriptResponse.java | 2 +- .../mozilla/geckoview/StorageController.java | 8 ++++---- .../org/mozilla/geckoview/WebExtension.java | 12 ++++++------ .../geckoview/WebExtensionController.java | 10 +++++----- .../java/org/mozilla/geckoview/WebMessage.java | 6 +++--- .../org/mozilla/geckoview/WebNotification.java | 6 +++--- .../geckoview/WebNotificationDelegate.java | 4 ++-- .../mozilla/geckoview/WebPushController.java | 6 +++--- .../org/mozilla/geckoview/WebPushDelegate.java | 6 +++--- .../mozilla/geckoview/WebPushSubscription.java | 6 +++--- .../java/org/mozilla/geckoview/WebRequest.java | 8 ++++---- .../org/mozilla/geckoview/WebRequestError.java | 6 +++--- .../org/mozilla/geckoview/WebResponse.java | 6 +++--- .../mozilla/geckoview/doc-files/CHANGELOG.md | 6 +++++- mobile/android/geckoview_example/build.gradle | 10 +++++----- .../BasicGeckoViewPrompt.java | 4 ++-- .../geckoview_example/ExampleCrashHandler.java | 4 ++-- .../geckoview_example/GeckoViewActivity.java | 18 +++++++++--------- .../geckoview_example/LocationView.java | 2 +- .../geckoview_example/SettingsActivity.java | 6 +++--- .../mozilla/geckoview_example/TabSession.java | 6 +++--- .../geckoview_example/TabSessionManager.java | 2 +- .../geckoview_example/ToolbarLayout.java | 6 ++---- .../src/main/res/layout/activity_settings.xml | 2 +- .../src/main/res/layout/geckoview_activity.xml | 2 +- 126 files changed, 301 insertions(+), 339 deletions(-) diff --git a/build.gradle b/build.gradle index 4a18fdfcd651..7c728f46b133 100644 --- a/build.gradle +++ b/build.gradle @@ -72,18 +72,9 @@ buildscript { } ext.kotlin_version = '1.3.41' - ext.support_library_version = '28.0.0' - ext.jacoco_version = '0.8.1' - ext.lifecycle_library_version = '1.1.1' - - if (gradle.mozconfig.substs.MOZ_ANDROID_GOOGLE_PLAY_SERVICES) { - ext.google_play_services_version = '15.0.1' - ext.google_play_services_cast_version = '16.0.0' - ext.google_play_services_fido_version = '17.0.0' - } dependencies { - classpath 'org.mozilla.apilint:apilint:0.3.0' + classpath 'org.mozilla.apilint:apilint:0.3.1' classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2' classpath 'org.apache.commons:commons-exec:1.3' diff --git a/gradle.properties b/gradle.properties index da3212408a90..dcebb20d74ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ org.gradle.parallel=true org.gradle.daemon=true org.gradle.jvmargs=-Xmx6656M +android.useAndroidX=true diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java index 7f6435ebc449..4b01286b2666 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera1Enumerator.java @@ -11,7 +11,7 @@ package org.webrtc; import android.os.SystemClock; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.List; import org.webrtc.CameraEnumerationAndroid.CaptureFormat; diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java index baf1e96b6bdc..3c1d477c3ab4 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java @@ -13,7 +13,7 @@ package org.webrtc; import android.annotation.TargetApi; import android.content.Context; import android.hardware.camera2.CameraManager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; @TargetApi(21) public class Camera2Capturer extends CameraCapturer { diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java index b32b3ad30233..542a23edc29d 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/Camera2Enumerator.java @@ -20,7 +20,7 @@ import android.hardware.camera2.CameraMetadata; import android.hardware.camera2.params.StreamConfigurationMap; import android.os.Build; import android.os.SystemClock; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AndroidException; import android.util.Range; import java.util.ArrayList; diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/EglBase.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/EglBase.java index c1cb906c5d83..984ec4ad3ff2 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/EglBase.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/EglBase.java @@ -11,7 +11,7 @@ package org.webrtc; import android.graphics.SurfaceTexture; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Surface; import java.util.ArrayList; import javax.microedition.khronos.egl.EGL10; diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/JavaI420Buffer.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/JavaI420Buffer.java index 0deb38f18717..322b8f38c976 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/JavaI420Buffer.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/JavaI420Buffer.java @@ -10,7 +10,7 @@ package org.webrtc; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.nio.ByteBuffer; import org.webrtc.VideoFrame.I420Buffer; diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java index 3522a8748791..b1d727604eea 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java @@ -17,7 +17,7 @@ import android.opengl.GLES20; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.concurrent.Callable; import org.webrtc.EglBase.Context; import org.webrtc.TextureBufferImpl.RefCountMonitor; diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/TextureBufferImpl.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/TextureBufferImpl.java index 1943c65e358a..6cff1d28a51b 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/TextureBufferImpl.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/TextureBufferImpl.java @@ -12,7 +12,7 @@ package org.webrtc; import android.graphics.Matrix; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Android texture buffer that glues together the necessary information together with a generic diff --git a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java index 66c1c4fb0e14..4c01ad5d70c3 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java +++ b/media/webrtc/trunk/webrtc/sdk/android/api/org/webrtc/VideoFrameDrawer.java @@ -13,7 +13,7 @@ package org.webrtc; import android.graphics.Matrix; import android.graphics.Point; import android.opengl.GLES20; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.nio.ByteBuffer; /** diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java index 06c12a253c8e..c9bb79ca9372 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java @@ -22,7 +22,7 @@ import android.hardware.camera2.CameraMetadata; import android.hardware.camera2.CaptureFailure; import android.hardware.camera2.CaptureRequest; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Range; import android.view.Surface; import java.util.Arrays; diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java index 15fa9baefd7c..845f2aef735a 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java @@ -13,7 +13,7 @@ package org.webrtc; import android.content.Context; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Arrays; @SuppressWarnings("deprecation") diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase10Impl.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase10Impl.java index 3ae38f0e7846..71bf6106da99 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase10Impl.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase10Impl.java @@ -13,7 +13,7 @@ package org.webrtc; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.SurfaceTexture; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Surface; import android.view.SurfaceHolder; import javax.microedition.khronos.egl.EGL10; diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase14Impl.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase14Impl.java index 1c519ffde5fc..40ba5d843f97 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase14Impl.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/EglBase14Impl.java @@ -19,9 +19,8 @@ import android.opengl.EGLDisplay; import android.opengl.EGLExt; import android.opengl.EGLSurface; import android.os.Build; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Surface; -import org.webrtc.EglBase; /** * Holds EGL state and utility methods for handling an EGL14 EGLContext, an EGLDisplay, diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/GlGenericDrawer.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/GlGenericDrawer.java index 92b42454995f..72b232f9b014 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/GlGenericDrawer.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/GlGenericDrawer.java @@ -12,11 +12,8 @@ package org.webrtc; import android.opengl.GLES11Ext; import android.opengl.GLES20; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.nio.FloatBuffer; -import org.webrtc.GlShader; -import org.webrtc.GlUtil; -import org.webrtc.RendererCommon; /** * Helper class to implement an instance of RendererCommon.GlDrawer that can accept multiple input diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java index 76e6e179daeb..0fb1afe74be4 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/NV21Buffer.java @@ -10,7 +10,7 @@ package org.webrtc; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.nio.ByteBuffer; public class NV21Buffer implements VideoFrame.Buffer { diff --git a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/RefCountDelegate.java b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/RefCountDelegate.java index 58be7aa0fb3b..8ae19940b337 100644 --- a/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/RefCountDelegate.java +++ b/media/webrtc/trunk/webrtc/sdk/android/src/java/org/webrtc/RefCountDelegate.java @@ -10,7 +10,7 @@ package org.webrtc; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 175ec85518d9..f9a21ed3390c 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -19,8 +19,6 @@ -keep public class * extends org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter -keep class org.mozilla.gecko.fxa.sync.FxAccountSyncAdapter --keep public class * extends android.support.v4.app.Fragment - # Preserve all native method names and the names of their classes. -keepclasseswithmembernames class * { native ; @@ -43,13 +41,6 @@ *** get*(); } -# Keep setters in support Fragment so that Robocop tests work, -# specifically testBrowserSearchVisibility. --keepclassmembers public class * extends android.support.v4.app.Fragment { - void set*(***); - *** get*(); -} - # Preserve enums. (For awful reasons, the runtime accesses them using introspection...) -keepclassmembers enum * { *; @@ -108,11 +99,6 @@ -dontnote com.android.vending.licensing.ILicensingService -# The Android Compatibility library references some classes that may not be -# present in all versions of the API, but we know that's ok. - --dontwarn android.support.** - # Preserve all native method names and the names of their classes. -keepclasseswithmembernames class * { @@ -161,10 +147,6 @@ -include "play-services-keeps.cfg" -# Don't print spurious warnings from the support library. -# See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-icucompatics-cant-find-dynamically-referenced-cl --dontnote android.support.** - # Don't warn when classes referenced by JaCoCo are missing when running the build from android-dependencies. -dontwarn java.lang.instrument.** -dontwarn java.lang.management.** diff --git a/mobile/android/examples/messaging_example/app/build.gradle b/mobile/android/examples/messaging_example/app/build.gradle index e733c70f1e5f..92e24ffa575b 100644 --- a/mobile/android/examples/messaging_example/app/build.gradle +++ b/mobile/android/examples/messaging_example/app/build.gradle @@ -42,9 +42,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-annotations:$support_library_version" - implementation "com.android.support:appcompat-v7:$support_library_version" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation "androidx.annotation:annotation:1.0.0" + implementation "androidx.appcompat:appcompat:1.0.0" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' // Replace this with implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}" implementation project(path: ':geckoview') diff --git a/mobile/android/examples/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java b/mobile/android/examples/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java index d0455cc4a5c6..54267276f134 100644 --- a/mobile/android/examples/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java +++ b/mobile/android/examples/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java @@ -1,8 +1,8 @@ package org.mozilla.geckoview.example.messaging; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; diff --git a/mobile/android/examples/messaging_example/app/src/main/res/layout/activity_main.xml b/mobile/android/examples/messaging_example/app/src/main/res/layout/activity_main.xml index 26e7055c8245..87e7c0ae72c3 100644 --- a/mobile/android/examples/messaging_example/app/src/main/res/layout/activity_main.xml +++ b/mobile/android/examples/messaging_example/app/src/main/res/layout/activity_main.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/mobile/android/examples/port_messaging_example/app/build.gradle b/mobile/android/examples/port_messaging_example/app/build.gradle index a3d0a5869acb..78fc11bb715c 100644 --- a/mobile/android/examples/port_messaging_example/app/build.gradle +++ b/mobile/android/examples/port_messaging_example/app/build.gradle @@ -42,9 +42,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:support-annotations:$support_library_version" - implementation "com.android.support:appcompat-v7:$support_library_version" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation "androidx.annotation:annotation:1.0.0" + implementation "androidx.appcompat:appcompat:1.0.0" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' implementation project(path: ':geckoview') } diff --git a/mobile/android/examples/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java b/mobile/android/examples/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java index 90f01d1d8c5f..81ba00b7f321 100644 --- a/mobile/android/examples/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java +++ b/mobile/android/examples/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java @@ -1,8 +1,8 @@ package org.mozilla.geckoview.example.messaging; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.KeyEvent; diff --git a/mobile/android/examples/port_messaging_example/app/src/main/res/layout/activity_main.xml b/mobile/android/examples/port_messaging_example/app/src/main/res/layout/activity_main.xml index 26e7055c8245..87e7c0ae72c3 100644 --- a/mobile/android/examples/port_messaging_example/app/src/main/res/layout/activity_main.xml +++ b/mobile/android/examples/port_messaging_example/app/src/main/res/layout/activity_main.xml @@ -3,7 +3,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index ff1dccd570b7..a46277dd3503 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -14,10 +14,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; import android.util.AttributeSet; import android.util.SparseArray; import android.view.ActionMode; @@ -35,6 +31,10 @@ import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.InputConnection; import android.widget.FrameLayout; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import java.io.File; import java.io.InputStream; import java.lang.Boolean; diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle index e295f33e208c..0e08f8efe7b6 100644 --- a/mobile/android/geckoview/build.gradle +++ b/mobile/android/geckoview/build.gradle @@ -213,18 +213,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { dependencies { // For exoplayer. - implementation "androidx.annotation:annotation:1.1.0" compileOnly "com.google.code.findbugs:jsr305:3.0.2" compileOnly "org.checkerframework:checker-compat-qual:2.5.0" compileOnly "org.checkerframework:checker-qual:2.5.0" compileOnly "org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.70" - implementation "com.android.support:support-v4:$support_library_version" - implementation "com.android.support:palette-v7:$support_library_version" + implementation "androidx.annotation:annotation:1.1.0" + implementation "androidx.legacy:legacy-support-v4:1.0.0" + implementation "androidx.palette:palette:1.0.0" implementation "org.yaml:snakeyaml:1.24:android" - implementation "android.arch.lifecycle:extensions:$lifecycle_library_version" - implementation "android.arch.lifecycle:common-java8:$lifecycle_library_version" + implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testImplementation 'junit:junit:4.12' @@ -238,8 +238,6 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' - androidTestImplementation "com.android.support:support-annotations:$support_library_version" - androidTestImplementation 'com.koushikdutta.async:androidasync:2.+' } @@ -556,6 +554,7 @@ apiLint { allowedPackages = [ 'java', 'android', + 'androidx', 'org.json', 'org.mozilla.geckoview', ] diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt index 404a991e4a44..072e5a93965c 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt @@ -19,7 +19,7 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.Callbacks -import android.support.annotation.AnyThread +import androidx.annotation.AnyThread import androidx.test.filters.MediumTest import androidx.test.ext.junit.runners.AndroidJUnit4 import android.util.Pair diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt index ea2159fd6035..c583af6ba9e7 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt @@ -15,7 +15,7 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.Callbacks -import android.support.annotation.AnyThread +import androidx.annotation.AnyThread import androidx.test.filters.MediumTest import androidx.test.ext.junit.runners.AndroidJUnit4 import android.view.Surface diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt index 347351f58140..04f0e07f00df 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt @@ -3,7 +3,7 @@ package org.mozilla.geckoview.test import androidx.test.filters.LargeTest import androidx.test.rule.ActivityTestRule import androidx.test.ext.junit.runners.AndroidJUnit4 -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.view.View import org.hamcrest.MatcherAssert.assertThat diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestCrashHandler.java b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestCrashHandler.java index 38c3280898cb..c922b9bce194 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestCrashHandler.java +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestCrashHandler.java @@ -13,8 +13,6 @@ import android.os.Looper; import android.os.Message; import android.os.Messenger; import android.os.RemoteException; -import android.support.annotation.Nullable; -import android.util.Log; import org.mozilla.geckoview.GeckoRuntime; import org.mozilla.geckoview.test.util.UiThreadUtils; diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java index 3035fb9fad2f..24cce230aa2f 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java @@ -5,7 +5,6 @@ package org.mozilla.geckoview.test; -import org.json.JSONObject; import org.mozilla.geckoview.AllowOrDeny; import org.mozilla.geckoview.GeckoDisplay; import org.mozilla.geckoview.GeckoResult; @@ -23,16 +22,14 @@ import android.content.Intent; import android.graphics.SurfaceTexture; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.Surface; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Stack; public class TestRunnerActivity extends Activity { private static final String LOGTAG = "TestRunnerActivity"; diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushUtils.java b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushUtils.java index bb1a44329ead..a4b21204587c 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushUtils.java +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushUtils.java @@ -6,8 +6,8 @@ package org.mozilla.geckoview.test; -import android.support.annotation.AnyThread; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.Nullable; import android.util.Base64; import java.math.BigInteger; @@ -17,12 +17,10 @@ import java.security.KeyFactory; import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; import java.security.interfaces.ECPublicKey; -import java.security.spec.ECFieldFp; import java.security.spec.ECGenParameterSpec; import java.security.spec.ECParameterSpec; import java.security.spec.ECPoint; import java.security.spec.ECPublicKeySpec; -import java.security.spec.EllipticCurve; import java.security.spec.InvalidKeySpecException; /** diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/rule/GeckoSessionTestRule.java b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/rule/GeckoSessionTestRule.java index 8f9c54f70ba0..d1ee7ecb8d25 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/rule/GeckoSessionTestRule.java +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/rule/GeckoSessionTestRule.java @@ -44,8 +44,8 @@ import android.app.Instrumentation; import android.graphics.Point; import android.graphics.SurfaceTexture; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.test.platform.app.InstrumentationRegistry; import android.util.Log; import android.util.Pair; diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/RuntimeCreator.java b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/RuntimeCreator.java index 5858d44da6ca..15151bb0d8eb 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/RuntimeCreator.java +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/RuntimeCreator.java @@ -8,9 +8,9 @@ import org.mozilla.geckoview.test.TestCrashHandler; import android.os.Looper; import android.os.Process; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import androidx.test.platform.app.InstrumentationRegistry; import android.util.Log; diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/UiThreadUtils.java b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/UiThreadUtils.java index 59186dab9378..4cb0dca7b051 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/UiThreadUtils.java +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/UiThreadUtils.java @@ -11,7 +11,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.MessageQueue; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/EventDispatcher.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/EventDispatcher.java index 386c8dcd032b..d2602114e531 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/EventDispatcher.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/EventDispatcher.java @@ -17,7 +17,7 @@ import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.geckoview.BuildConfig; import android.os.Handler; -import android.support.annotation.AnyThread; +import androidx.annotation.AnyThread; import android.util.Log; import java.util.ArrayDeque; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java index 995b23316c32..51ce93e283cd 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java @@ -75,9 +75,9 @@ import android.os.Looper; import android.os.PowerManager; import android.os.Vibrator; import android.provider.Settings; -import android.support.annotation.Nullable; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v4.util.SimpleArrayMap; +import androidx.annotation.Nullable; +import androidx.core.content.res.ResourcesCompat; +import androidx.collection.SimpleArrayMap; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java index 8f5df8dc4d57..8385f603c67f 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java @@ -12,7 +12,7 @@ import org.mozilla.gecko.util.ThreadUtils; import android.graphics.RectF; import android.os.IBinder; import android.os.RemoteException; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.view.KeyEvent; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java index 5b7633fb4a65..b3ed79172310 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java @@ -8,8 +8,8 @@ package org.mozilla.gecko; import android.os.Looper; import android.os.SystemClock; import android.util.Log; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Queue; import java.util.concurrent.Executors; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoNetworkManager.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoNetworkManager.java index 554de6537a5b..dcfd7bd3f0a5 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoNetworkManager.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoNetworkManager.java @@ -24,8 +24,8 @@ import android.net.ConnectivityManager; import android.net.DhcpInfo; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.TelephonyManager; import android.text.format.Formatter; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java index cfc6d104fdd7..46b80f25d12e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java @@ -6,9 +6,9 @@ package org.mozilla.gecko; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSystemStateListener.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSystemStateListener.java index 5122377bdbce..ca835607b27e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSystemStateListener.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSystemStateListener.java @@ -15,7 +15,7 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import android.view.InputDevice; import org.mozilla.gecko.annotation.WrapForJNI; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java index 9832b79b954e..2bddba927813 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java @@ -14,7 +14,6 @@ import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.geckoview.BuildConfig; import org.mozilla.geckoview.GeckoResult; -import org.mozilla.gecko.GeckoJavaSampler; import android.app.ActivityManager; import android.content.Context; @@ -28,9 +27,9 @@ import android.os.Message; import android.os.MessageQueue; import android.os.Process; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.text.TextUtils; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/MultiMap.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/MultiMap.java index ba716ed5926f..14f2bc499eb0 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/MultiMap.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/MultiMap.java @@ -1,7 +1,7 @@ package org.mozilla.gecko; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/PrefsHelper.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/PrefsHelper.java index 3e63714b2084..420de4834da4 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/PrefsHelper.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/PrefsHelper.java @@ -8,7 +8,7 @@ package org.mozilla.gecko; import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import java.util.ArrayList; import java.util.HashSet; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java index 732fda42aac0..56ff587c040e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoSurfaceTexture.java @@ -7,7 +7,7 @@ package org.mozilla.gecko.gfx; import android.graphics.SurfaceTexture; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import java.util.concurrent.atomic.AtomicInteger; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/VsyncSource.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/VsyncSource.java index f8444f08637f..f4a96492276a 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/VsyncSource.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/VsyncSource.java @@ -10,7 +10,7 @@ import android.hardware.display.DisplayManager; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.view.Choreographer; import android.view.Display; import org.mozilla.gecko.annotation.WrapForJNI; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoPlayerFactory.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoPlayerFactory.java index 222154551375..01e7c5c793c6 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoPlayerFactory.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoPlayerFactory.java @@ -4,7 +4,7 @@ package org.mozilla.gecko.media; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.util.ArrayList; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java index b47e8878d187..fe288a916b10 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java @@ -16,7 +16,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.Surface; import java.io.IOException; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java index fe85382173ae..699ae3e35011 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java @@ -5,7 +5,7 @@ package org.mozilla.gecko.mozglue; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import org.mozilla.gecko.annotation.JNITarget; import java.io.InputStream; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java index d383ea6698ad..9e6e169a3bac 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java @@ -10,7 +10,7 @@ package org.mozilla.gecko.mozglue; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import java.util.ArrayList; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java index 721bfcb0118b..f862bfe30728 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java @@ -23,10 +23,10 @@ import android.os.DeadObjectException; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.RemoteException; -import android.support.annotation.NonNull; -import android.support.v4.util.ArrayMap; -import android.support.v4.util.ArraySet; -import android.support.v4.util.SimpleArrayMap; +import androidx.annotation.NonNull; +import androidx.collection.ArrayMap; +import androidx.collection.ArraySet; +import androidx.collection.SimpleArrayMap; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java index fb3f706b8d25..fdb5de56b9b0 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java @@ -16,7 +16,7 @@ import android.content.pm.ServiceInfo; import android.content.ServiceConnection; import android.os.Build; import android.os.IBinder; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.util.BitSet; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceUtils.java index c377fc3b1c05..45325fa9baaf 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceUtils.java @@ -9,7 +9,7 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /* package */ final class ServiceUtils { private static final String DEFAULT_ISOLATED_CONTENT_SERVICE_NAME_SUFFIX = "0"; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java index 73a69a3abd66..f8af8561ff1d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java @@ -19,8 +19,8 @@ import android.graphics.Color; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.ColorInt; -import android.support.v7.graphics.Palette; +import androidx.annotation.ColorInt; +import androidx.palette.graphics.Palette; import android.util.Base64; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContentUriUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContentUriUtils.java index 1b84bc7a8629..826f329eb0a0 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContentUriUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContentUriUtils.java @@ -24,7 +24,7 @@ import android.os.Build; import android.os.Environment; import android.provider.DocumentsContract; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import java.io.File; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DateUtil.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DateUtil.java index 0401999c91c4..1bd7d429c16c 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DateUtil.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DateUtil.java @@ -6,7 +6,7 @@ package org.mozilla.gecko.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DebugConfig.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DebugConfig.java index cd96c190cf3b..1f6e7955dd29 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DebugConfig.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DebugConfig.java @@ -6,7 +6,7 @@ package org.mozilla.gecko.util; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.mozilla.gecko.GeckoThread; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FileUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FileUtils.java index f7b7efce8807..502b16aac4e7 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FileUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FileUtils.java @@ -13,7 +13,7 @@ import android.os.Build; import android.os.Environment; import android.os.storage.StorageVolume; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBundle.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBundle.java index 4c7b4fc1d0bf..9bdc2285975e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBundle.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBundle.java @@ -16,7 +16,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageDecoder.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageDecoder.java index bc9cf471e89c..c34591e88125 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageDecoder.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageDecoder.java @@ -1,8 +1,8 @@ package org.mozilla.gecko.util; import android.graphics.Bitmap; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import org.mozilla.gecko.GeckoThread; import org.mozilla.gecko.annotation.WrapForJNI; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java index 7d668c7adc2a..4ed93ef37a3b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java @@ -7,9 +7,9 @@ package org.mozilla.gecko.util; import android.graphics.Bitmap; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import java.util.ArrayList; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java index ce60d5289b01..0536c97b498b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java @@ -10,8 +10,8 @@ import android.annotation.TargetApi; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.CheckResult; -import android.support.annotation.NonNull; +import androidx.annotation.CheckResult; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.mozilla.gecko.mozglue.SafeIntent; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java index 1f1fa76d5237..43fd65211217 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java @@ -8,7 +8,7 @@ package org.mozilla.gecko.util; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.TelephonyManager; public class NetworkUtils { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index 3940d3c84249..636586b23102 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -18,7 +18,7 @@ package org.mozilla.gecko.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import java.io.IOException; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/StringUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/StringUtils.java index d9cdfcb4397a..87001bebc37e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/StringUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/StringUtils.java @@ -8,7 +8,7 @@ package org.mozilla.gecko.util; import android.graphics.Paint; import android.graphics.Rect; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import java.nio.charset.Charset; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/XPCOMEventTarget.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/XPCOMEventTarget.java index 2f0c6d2cf2aa..4962316d3027 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/XPCOMEventTarget.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/XPCOMEventTarget.java @@ -10,7 +10,7 @@ import org.mozilla.gecko.GeckoThread; import org.mozilla.gecko.mozglue.JNIObject; import org.mozilla.geckoview.BuildConfig; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Wrapper for nsIEventTarget, enabling seamless dispatch of java runnables to diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/AllowOrDeny.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/AllowOrDeny.java index 86e091564297..59be6e08e1e2 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/AllowOrDeny.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/AllowOrDeny.java @@ -6,7 +6,7 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; +import androidx.annotation.AnyThread; /** * This represents a decision to allow or deny a request. diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java index e90df740e613..aabdb9d04408 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java @@ -9,11 +9,11 @@ package org.mozilla.geckoview; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.Log; import org.mozilla.gecko.EventDispatcher; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autofill.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autofill.java index 6a81d2f42ffa..7a0e682a1e95 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autofill.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autofill.java @@ -15,12 +15,12 @@ import java.util.Map; import android.annotation.TargetApi; import android.graphics.Rect; import android.os.Build; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.v4.util.ArrayMap; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.collection.ArrayMap; import android.util.Log; import android.util.SparseArray; import android.view.View; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/BasicSelectionActionDelegate.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/BasicSelectionActionDelegate.java index 9340772016b0..c189dcb3f5d3 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/BasicSelectionActionDelegate.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/BasicSelectionActionDelegate.java @@ -15,9 +15,9 @@ import android.graphics.Matrix; import android.graphics.Rect; import android.graphics.RectF; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.Log; import android.view.ActionMode; import android.view.Menu; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CompositorController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CompositorController.java index 243c1cfd8477..dedeabfb83e5 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CompositorController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CompositorController.java @@ -9,9 +9,9 @@ import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.util.ThreadUtils; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import java.util.ArrayList; import java.util.List; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java index a321fe5600b7..e290f4ef83b8 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java @@ -11,11 +11,11 @@ import java.lang.annotation.RetentionPolicy; import android.os.Parcelable; import android.os.Parcel; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.text.TextUtils; import org.mozilla.gecko.util.GeckoBundle; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java index 7ddd973f59b2..81c3ccd5ebcd 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java @@ -12,11 +12,11 @@ import org.json.JSONObject; import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.util.GeckoBundle; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; import android.util.Log; import java.lang.annotation.Retention; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java index 70e436fcf90a..d0f4a53f8bb2 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java @@ -6,8 +6,8 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import android.util.Log; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java index 1517c9033aef..5f19570e6459 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java @@ -8,10 +8,10 @@ package org.mozilla.geckoview; import android.graphics.Bitmap; import android.graphics.Rect; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.view.Surface; import org.mozilla.gecko.util.ThreadUtils; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java index e585e97a9103..bba0f794d810 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java @@ -29,8 +29,8 @@ import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.InputFilter; import android.text.InputType; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoFontScaleListener.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoFontScaleListener.java index 5704ec6d3225..86c1f0b2849d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoFontScaleListener.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoFontScaleListener.java @@ -6,7 +6,6 @@ package org.mozilla.geckoview; import org.mozilla.gecko.util.ThreadUtils; -import org.mozilla.geckoview.GeckoRuntimeSettings; import android.annotation.SuppressLint; import android.content.ContentResolver; @@ -14,7 +13,7 @@ import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import android.util.Log; /** diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java index 53cbb24e6718..bc186910f609 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java @@ -14,7 +14,7 @@ import android.media.AudioManager; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.text.Selection; import android.text.SpannableString; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputStream.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputStream.java index 7e66daa53aad..426d27c91484 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputStream.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputStream.java @@ -4,8 +4,8 @@ import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.mozglue.JNIObject; import org.mozilla.gecko.util.ThreadUtils; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import java.io.IOException; import java.io.InputStream; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoResult.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoResult.java index 31df22407e75..4e90794ad040 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoResult.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoResult.java @@ -9,10 +9,10 @@ import org.mozilla.gecko.util.XPCOMEventTarget; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.SimpleArrayMap; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.SimpleArrayMap; import java.util.ArrayList; import java.util.Arrays; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index c908d23229d1..be58aa3f93f2 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -6,10 +6,10 @@ package org.mozilla.geckoview; -import android.arch.lifecycle.ProcessLifecycleOwner; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.ProcessLifecycleOwner; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; import android.app.ActivityManager; import android.content.ComponentName; @@ -24,11 +24,11 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.Process; import android.provider.Settings; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.v4.util.ArrayMap; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.collection.ArrayMap; import android.util.Log; import org.mozilla.gecko.EventDispatcher; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 59ee4e9ca66e..a77d36764f53 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -18,10 +18,10 @@ import android.os.Bundle; import android.os.LocaleList; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java index 35c944b25ee8..ed42888f3f09 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java @@ -53,13 +53,13 @@ import android.os.IInterface; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.LongDef; -import android.support.annotation.Nullable; -import android.support.annotation.NonNull; -import android.support.annotation.StringDef; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.LongDef; +import androidx.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.StringDef; +import androidx.annotation.UiThread; import android.text.TextUtils; import android.util.Base64; import android.util.Log; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java index 033c116cfb8d..ce92ae27c15b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java @@ -10,7 +10,7 @@ import org.mozilla.gecko.util.BundleEventListener; import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.GeckoBundle; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import android.util.Log; /* package */ abstract class GeckoSessionHandler diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java index c4f84e68b9b0..30fc555e8c74 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java @@ -10,9 +10,9 @@ import org.mozilla.gecko.util.GeckoBundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Arrays; import java.util.Collection; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoVRManager.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoVRManager.java index 81bdb20ecdc5..94a4c7266c75 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoVRManager.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoVRManager.java @@ -6,7 +6,7 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; +import androidx.annotation.AnyThread; import org.mozilla.gecko.annotation.WrapForJNI; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java index 463d4d4a0635..fb1689792e60 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java @@ -27,12 +27,12 @@ import android.graphics.RectF; import android.graphics.Region; import android.os.Build; import android.os.Handler; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.v4.view.ViewCompat; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.SparseArray; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java index 321ae87ea7dd..1f6c16e52f48 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java @@ -6,9 +6,9 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Image.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Image.java index c6157f809495..c5a619c50d88 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Image.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Image.java @@ -7,8 +7,8 @@ package org.mozilla.geckoview; import android.graphics.Bitmap; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.ImageResource; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java index 65fe30c534c4..d2207d0cb11d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java @@ -6,11 +6,11 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import org.mozilla.gecko.util.GeckoBundle; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java index 74c9eb91ba03..49e337bf3c19 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java @@ -9,11 +9,11 @@ package org.mozilla.geckoview; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import android.support.annotation.AnyThread; -import android.support.annotation.LongDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.LongDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.Log; import org.mozilla.gecko.util.EventCallback; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/OverscrollEdgeEffect.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/OverscrollEdgeEffect.java index 84df6f252fe9..887bbb75023b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/OverscrollEdgeEffect.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/OverscrollEdgeEffect.java @@ -14,9 +14,9 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.widget.EdgeEffect; import java.lang.reflect.Field; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/PanZoomController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/PanZoomController.java index 5265f31b79cf..a712453f3b35 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/PanZoomController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/PanZoomController.java @@ -17,9 +17,9 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; -import android.support.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; +import androidx.annotation.IntDef; import android.util.Log; import android.util.Pair; import android.view.MotionEvent; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ProfilerController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ProfilerController.java index 0281eca893f5..0e7eff697831 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ProfilerController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ProfilerController.java @@ -8,9 +8,9 @@ package org.mozilla.geckoview; import org.mozilla.gecko.GeckoJavaSampler; -import android.support.annotation.Nullable; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; +import androidx.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; /** * ProfilerController is used to manage GeckoProfiler related features. diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeSettings.java index 2430decd52a3..7f3db4f83440 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeSettings.java @@ -12,10 +12,10 @@ import java.util.Map; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.util.ArrayMap; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.collection.ArrayMap; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.util.GeckoBundle; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeTelemetry.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeTelemetry.java index a6e21bfcf748..899fa90337ab 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeTelemetry.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/RuntimeTelemetry.java @@ -6,8 +6,8 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.mozglue.JNIObject; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ScreenLength.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ScreenLength.java index c33098038b5d..918af303fdfb 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ScreenLength.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ScreenLength.java @@ -3,9 +3,9 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionAccessibility.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionAccessibility.java index 80af6859cf15..7f8ca1b18146 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionAccessibility.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionAccessibility.java @@ -19,9 +19,9 @@ import android.graphics.Matrix; import android.graphics.Rect; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionFinder.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionFinder.java index 66506846132c..31e7f68c432b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionFinder.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionFinder.java @@ -11,9 +11,9 @@ import org.mozilla.geckoview.GeckoSession.FinderFindFlags; import org.mozilla.geckoview.GeckoSession.FinderDisplayFlags; import org.mozilla.geckoview.GeckoSession.FinderResult; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Pair; import java.util.Arrays; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionTextInput.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionTextInput.java index ed89bc8be20e..37342aac6960 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionTextInput.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SessionTextInput.java @@ -9,10 +9,10 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.RectF; import android.os.Handler; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.text.Editable; import android.util.Log; import android.view.KeyEvent; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SlowScriptResponse.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SlowScriptResponse.java index 9016fee3c024..e512ee04385f 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SlowScriptResponse.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/SlowScriptResponse.java @@ -6,7 +6,7 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; +import androidx.annotation.AnyThread; /** * Used by a ContentDelegate to indicate what action to take on a slow script event. diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/StorageController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/StorageController.java index f930a796afda..877c6bdde8c0 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/StorageController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/StorageController.java @@ -10,10 +10,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.math.BigInteger; -import android.support.annotation.AnyThread; -import android.support.annotation.LongDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.LongDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.util.GeckoBundle; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java index 306629687d2f..a31d1aed04d6 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java @@ -1,12 +1,12 @@ package org.mozilla.geckoview; import android.graphics.Color; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.LongDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.LongDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.Log; import org.json.JSONException; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java index d5f4e89dd815..03e0317e4979 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java @@ -1,10 +1,10 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.Log; import org.json.JSONException; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebMessage.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebMessage.java index 3a0e63a2d36f..1a37950d3768 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebMessage.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebMessage.java @@ -8,9 +8,9 @@ package org.mozilla.geckoview; import org.mozilla.gecko.annotation.WrapForJNI; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.v4.util.ArrayMap; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.collection.ArrayMap; import java.nio.ByteBuffer; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotification.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotification.java index 90dc02851ab4..daac8e6486e2 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotification.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotification.java @@ -1,8 +1,8 @@ package org.mozilla.geckoview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.annotation.WrapForJNI; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotificationDelegate.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotificationDelegate.java index 3400f026fa53..f78e30bc8cc6 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotificationDelegate.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebNotificationDelegate.java @@ -1,7 +1,7 @@ package org.mozilla.geckoview; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import org.mozilla.gecko.annotation.WrapForJNI; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushController.java index d45e62c57d7f..58703005a051 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushController.java @@ -13,9 +13,9 @@ import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.ThreadUtils; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.Log; public class WebPushController { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushDelegate.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushDelegate.java index 1ec97deaa9b5..0514272865fa 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushDelegate.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushDelegate.java @@ -6,9 +6,9 @@ package org.mozilla.geckoview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; public interface WebPushDelegate { /** diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushSubscription.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushSubscription.java index abef026db699..46f5aae063a2 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushSubscription.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebPushSubscription.java @@ -10,9 +10,9 @@ import org.mozilla.gecko.util.GeckoBundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Arrays; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 865d7a4436f4..7e3aa285c5be 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -8,10 +8,10 @@ package org.mozilla.geckoview; import org.mozilla.gecko.annotation.WrapForJNI; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequestError.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequestError.java index 083bd08a2e2a..043bded6034a 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequestError.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequestError.java @@ -9,9 +9,9 @@ package org.mozilla.geckoview; import org.mozilla.gecko.annotation.WrapForJNI; import android.annotation.SuppressLint; -import android.support.annotation.AnyThread; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; import java.io.ByteArrayInputStream; import java.lang.annotation.Retention; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebResponse.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebResponse.java index 1358c0c9dee9..9d792e937e9b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebResponse.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebResponse.java @@ -8,9 +8,9 @@ package org.mozilla.geckoview; import org.mozilla.gecko.annotation.WrapForJNI; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md index ac9f9306716f..dfe0f4472d8c 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md @@ -13,6 +13,8 @@ exclude: true ⚠️ breaking change and deprecation notices +## v83 + ## v82 - ⚠️ [`WebNotification.source`][79.2] is now `@Nullable` to account for WebExtension notifications which don't have a `source` field. @@ -32,6 +34,8 @@ exclude: true ([bug 1659073]({{bugzilla}}1659073)) - Removed `Parcelable` support in `GeckoSession`. Use [`ProgressDelegate#onSessionStateChange`][68.29] and [`ProgressDelegate#restoreState`][82.5] instead. ([bug 1650108]({{bugzilla}}1650108)) +- ⚠️ Use AndroidX instead of the Android support library. For the public API this only changes + the thread and nullable annotation types. [82.1]: {{javadoc_uri}}/GeckoSession.ContentDelegate.html#onExternalResponse-org.mozilla.geckoview.GeckoSession-org.mozilla.geckoview.GeckoSession.WebResponseInfo- [82.2]: {{javadoc_uri}}/GeckoSession.ContentDelegate.html#onExternalResponse-org.mozilla.geckoview.GeckoSession-org.mozilla.geckoview.GeckoResult- @@ -796,4 +800,4 @@ to allow adding gecko profiler markers. [65.24]: {{javadoc_uri}}/CrashReporter.html#sendCrashReport-android.content.Context-android.os.Bundle-java.lang.String- [65.25]: {{javadoc_uri}}/GeckoResult.html -[api-version]: b75e10652f129f9fd9414e3c94cac91203a99927 +[api-version]: 6c24e94d3aecdae9046cfab8ec8470d81f2a2c96 diff --git a/mobile/android/geckoview_example/build.gradle b/mobile/android/geckoview_example/build.gradle index 1b61755ec87f..dac3e2dc03cf 100644 --- a/mobile/android/geckoview_example/build.gradle +++ b/mobile/android/geckoview_example/build.gradle @@ -49,11 +49,11 @@ android { } dependencies { - implementation "com.android.support:support-annotations:$support_library_version" - implementation "com.android.support:appcompat-v7:$support_library_version" - implementation "com.android.support:preference-v7:$support_library_version" + implementation "androidx.annotation:annotation:1.0.0" + implementation "androidx.appcompat:appcompat:1.0.0" + implementation "androidx.preference:preference:1.0.0" implementation project(path: ':geckoview') - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:design:28.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.0.0' } diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/BasicGeckoViewPrompt.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/BasicGeckoViewPrompt.java index 3304bfdab3b4..686c6a0f7155 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/BasicGeckoViewPrompt.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/BasicGeckoViewPrompt.java @@ -18,8 +18,8 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.InputType; import android.text.format.DateFormat; import android.util.Log; diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ExampleCrashHandler.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ExampleCrashHandler.java index 0edd238e2cb4..ae462cc6dfd3 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ExampleCrashHandler.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ExampleCrashHandler.java @@ -13,8 +13,8 @@ import android.content.Intent; import android.os.Build; import android.os.IBinder; import android.os.StrictMode; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.util.Log; public class ExampleCrashHandler extends Service { diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java index 3d367f61f00b..6642c4537d76 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java @@ -46,15 +46,15 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.preference.PreferenceManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.PreferenceManager; import android.text.InputType; import android.util.Log; import android.util.LruCache; diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/LocationView.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/LocationView.java index 0a9ca2a85426..076316643e9d 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/LocationView.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/LocationView.java @@ -6,7 +6,7 @@ package org.mozilla.geckoview_example; import android.content.Context; -import android.support.v7.widget.AppCompatEditText; +import androidx.appcompat.widget.AppCompatEditText; import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/SettingsActivity.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/SettingsActivity.java index 9f75020c9dec..127bc61fcc72 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/SettingsActivity.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/SettingsActivity.java @@ -1,9 +1,9 @@ package org.mozilla.geckoview_example; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.PreferenceFragmentCompat; +import androidx.appcompat.widget.Toolbar; public class SettingsActivity extends AppCompatActivity { @Override diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSession.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSession.java index f8d03a6c1892..e04439f726f5 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSession.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSession.java @@ -1,9 +1,9 @@ package org.mozilla.geckoview_example; import android.os.Parcel; -import android.support.annotation.AnyThread; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; import org.mozilla.geckoview.GeckoSession; import org.mozilla.geckoview.GeckoSessionSettings; diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSessionManager.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSessionManager.java index ecf76f376d08..9533190a5de0 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSessionManager.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/TabSessionManager.java @@ -1,6 +1,6 @@ package org.mozilla.geckoview_example; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mozilla.geckoview.GeckoSession; import org.mozilla.geckoview.GeckoSessionSettings; diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ToolbarLayout.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ToolbarLayout.java index 59cea971a8aa..15cb2355dfce 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ToolbarLayout.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/ToolbarLayout.java @@ -1,13 +1,11 @@ package org.mozilla.geckoview_example; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.PorterDuff; import android.graphics.Typeface; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.GradientDrawable; -import android.graphics.drawable.ShapeDrawable; -import android.support.v4.content.ContextCompat; + +import androidx.core.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; diff --git a/mobile/android/geckoview_example/src/main/res/layout/activity_settings.xml b/mobile/android/geckoview_example/src/main/res/layout/activity_settings.xml index b71f47530924..d6c4025ea6c3 100644 --- a/mobile/android/geckoview_example/src/main/res/layout/activity_settings.xml +++ b/mobile/android/geckoview_example/src/main/res/layout/activity_settings.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - -