For #27541: Update AndroidX Annotation to latest version.
Add AndroidX Annotation as a direct dependency to app build.gradle. Update imports for annotations moved to Companion Object.
This commit is contained in:
parent
919c40e407
commit
6913cd59c9
|
@ -560,6 +560,7 @@ dependencies {
|
|||
implementation Deps.mozilla_lib_dataprotect
|
||||
debugImplementation Deps.leakcanary
|
||||
|
||||
implementation Deps.androidx_annotation
|
||||
implementation Deps.androidx_compose_ui
|
||||
implementation Deps.androidx_compose_ui_tooling
|
||||
implementation Deps.androidx_compose_foundation
|
||||
|
|
|
@ -25,7 +25,7 @@ import android.view.WindowManager.LayoutParams.FLAG_SECURE
|
|||
import androidx.annotation.CallSuper
|
||||
import androidx.annotation.IdRes
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PROTECTED
|
||||
import androidx.annotation.VisibleForTesting.Companion.PROTECTED
|
||||
import androidx.appcompat.app.ActionBar
|
||||
import androidx.appcompat.widget.Toolbar
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
|
|
|
@ -7,7 +7,7 @@ package org.mozilla.fenix.components
|
|||
import android.content.Context
|
||||
import android.os.Build
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import kotlinx.coroutines.MainScope
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.browser.storage.sync.PlacesBookmarksStorage
|
||||
|
|
|
@ -7,7 +7,7 @@ package org.mozilla.fenix.components.toolbar
|
|||
import android.content.Context
|
||||
import androidx.annotation.ColorRes
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.core.content.ContextCompat.getColor
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
|
|
|
@ -11,7 +11,7 @@ import android.text.style.AbsoluteSizeSpan
|
|||
import android.text.style.ForegroundColorSpan
|
||||
import androidx.annotation.AttrRes
|
||||
import androidx.annotation.Dimension
|
||||
import androidx.annotation.Dimension.DP
|
||||
import androidx.annotation.Dimension.Companion.DP
|
||||
import mozilla.components.support.ktx.android.content.getColorFromAttr
|
||||
import mozilla.components.support.ktx.android.util.dpToPx
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ import android.view.TouchDelegate
|
|||
import android.view.View
|
||||
import android.view.accessibility.AccessibilityNodeInfo
|
||||
import androidx.annotation.Dimension
|
||||
import androidx.annotation.Dimension.DP
|
||||
import androidx.annotation.Dimension.Companion.DP
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.core.view.WindowInsetsCompat
|
||||
import mozilla.components.support.ktx.android.util.dpToPx
|
||||
|
|
|
@ -7,7 +7,7 @@ package org.mozilla.fenix.home
|
|||
import android.content.Context
|
||||
import android.view.View
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
package org.mozilla.fenix.home.recentbookmarks.controller
|
||||
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.navigation.NavController
|
||||
import mozilla.appservices.places.BookmarkRoot
|
||||
import mozilla.components.concept.engine.EngineSession
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
package org.mozilla.fenix.home.recenttabs.controller
|
||||
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.navigation.NavController
|
||||
import mozilla.components.browser.state.store.BrowserStore
|
||||
import mozilla.components.feature.tabs.TabsUseCases.SelectTabUseCase
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
package org.mozilla.fenix.home.recentvisits.controller
|
||||
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.navigation.NavController
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.launch
|
||||
|
|
|
@ -7,7 +7,7 @@ package org.mozilla.fenix.perf
|
|||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import mozilla.components.concept.base.profiler.Profiler
|
||||
import mozilla.components.support.base.facts.Action
|
||||
import mozilla.components.support.base.facts.Fact
|
||||
|
|
|
@ -8,8 +8,8 @@ import android.app.Activity
|
|||
import android.app.Application
|
||||
import android.os.Bundle
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.NONE
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.NONE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.lifecycle.DefaultLifecycleObserver
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.lifecycle.ProcessLifecycleOwner
|
||||
|
|
|
@ -7,8 +7,8 @@ package org.mozilla.fenix.perf
|
|||
import android.app.Activity
|
||||
import android.content.Intent
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.NONE
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.NONE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.lifecycle.DefaultLifecycleObserver
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
package org.mozilla.fenix.perf
|
||||
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.NONE
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.NONE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.lifecycle.DefaultLifecycleObserver
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
|
|
|
@ -10,7 +10,7 @@ import android.content.Context
|
|||
import android.os.Build
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.annotation.WorkerThread
|
||||
import androidx.core.content.getSystemService
|
||||
import kotlinx.coroutines.DelicateCoroutinesApi
|
||||
|
|
|
@ -14,7 +14,7 @@ import android.os.Handler
|
|||
import android.os.Looper
|
||||
import android.os.StrictMode
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.FragmentManager
|
||||
import mozilla.components.support.ktx.android.os.resetAfter
|
||||
|
|
|
@ -7,7 +7,7 @@ package org.mozilla.fenix.tabstray.browser
|
|||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PACKAGE_PRIVATE
|
||||
import org.mozilla.fenix.ext.components
|
||||
|
||||
class PrivateBrowserTrayList @JvmOverloads constructor(
|
||||
|
|
|
@ -13,7 +13,7 @@ import android.content.pm.ShortcutManager
|
|||
import android.os.Build
|
||||
import android.view.accessibility.AccessibilityManager
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import mozilla.components.concept.engine.Engine.HttpsOnlyMode
|
||||
import mozilla.components.feature.sitepermissions.SitePermissionsRules
|
||||
|
|
|
@ -17,7 +17,7 @@ import android.speech.RecognizerIntent
|
|||
import android.view.View
|
||||
import android.widget.RemoteViews
|
||||
import androidx.annotation.Dimension
|
||||
import androidx.annotation.Dimension.DP
|
||||
import androidx.annotation.Dimension.Companion.DP
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.appcompat.content.res.AppCompatResources
|
||||
import androidx.core.graphics.drawable.toBitmap
|
||||
|
|
|
@ -29,7 +29,7 @@ object Versions {
|
|||
const val androidx_constraint_layout = "2.0.4"
|
||||
const val androidx_preference = "1.1.1"
|
||||
const val androidx_legacy = "1.0.0"
|
||||
const val androidx_annotation = "1.1.0"
|
||||
const val androidx_annotation = "1.5.0"
|
||||
const val androidx_lifecycle = "2.5.1"
|
||||
const val androidx_fragment = "1.5.1"
|
||||
const val androidx_navigation = "2.5.1"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
package org.mozilla.fenix.detektrules.perf
|
||||
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.annotation.VisibleForTesting.PRIVATE
|
||||
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
|
||||
import io.gitlab.arturbosch.detekt.api.CodeSmell
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.api.Debt
|
||||
|
|
Loading…
Reference in New Issue