Update Kotlin and Jetpack Compose versions.
This commit is contained in:
parent
52facc9723
commit
170fa9705e
|
@ -402,6 +402,12 @@ configurations {
|
|||
jnaForTest
|
||||
}
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
|
||||
kotlinOptions {
|
||||
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
jnaForTest Deps.jna
|
||||
testImplementation files(configurations.jnaForTest.copyRecursive().files)
|
||||
|
|
|
@ -10,7 +10,6 @@ import android.view.View
|
|||
import android.view.ViewGroup
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.action.WebExtensionAction
|
||||
import mozilla.components.concept.engine.EngineSession
|
||||
import mozilla.components.concept.engine.EngineView
|
||||
|
@ -53,7 +52,6 @@ class WebExtensionActionPopupFragment : AddonPopupBaseFragment(), EngineSession.
|
|||
showToolbar(title)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@ import androidx.preference.PreferenceManager
|
|||
import com.google.android.material.snackbar.Snackbar
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
@ -143,7 +142,6 @@ import mozilla.components.feature.session.behavior.ToolbarPosition as MozacToolb
|
|||
* This class only contains shared code focused on the main browsing content.
|
||||
* UI code specific to the app or to custom tabs can be found in the subclasses.
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("TooManyFunctions", "LargeClass")
|
||||
abstract class BaseBrowserFragment :
|
||||
Fragment(),
|
||||
|
|
|
@ -13,7 +13,6 @@ import androidx.appcompat.content.res.AppCompatResources
|
|||
import androidx.lifecycle.Observer
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.selector.findTab
|
||||
import mozilla.components.browser.state.state.SessionState
|
||||
import mozilla.components.browser.state.state.TabSessionState
|
||||
|
@ -44,7 +43,6 @@ import org.mozilla.fenix.theme.ThemeManager
|
|||
/**
|
||||
* Fragment used for browsing the web within the main app.
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("TooManyFunctions", "LargeClass")
|
||||
class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@ import androidx.annotation.VisibleForTesting
|
|||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.navigation.NavController
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
|
@ -30,7 +29,6 @@ import org.mozilla.fenix.utils.Settings
|
|||
/**
|
||||
* Displays an [InfoBanner] when a user visits a website that can be opened in an installed native app.
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("LongParameterList")
|
||||
class OpenInAppOnboardingObserver(
|
||||
private val context: Context,
|
||||
|
|
|
@ -12,14 +12,12 @@ import android.view.ViewGroup
|
|||
import androidx.fragment.app.DialogFragment
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import org.mozilla.fenix.R
|
||||
import org.mozilla.fenix.components.StoreProvider
|
||||
import org.mozilla.fenix.databinding.FragmentCreateCollectionBinding
|
||||
import org.mozilla.fenix.ext.requireComponents
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class CollectionCreationFragment : DialogFragment() {
|
||||
private lateinit var collectionCreationView: CollectionCreationView
|
||||
private lateinit var collectionCreationStore: CollectionCreationStore
|
||||
|
|
|
@ -14,7 +14,6 @@ import androidx.annotation.VisibleForTesting
|
|||
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
|
||||
import mozilla.components.browser.state.selector.selectedTab
|
||||
import mozilla.components.browser.state.state.CustomTabSessionState
|
||||
|
@ -35,7 +34,6 @@ import org.mozilla.fenix.utils.ToolbarPopupWindow
|
|||
import java.lang.ref.WeakReference
|
||||
import mozilla.components.browser.toolbar.behavior.ToolbarPosition as MozacToolbarPosition
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@SuppressWarnings("LargeClass")
|
||||
class BrowserToolbarView(
|
||||
private val container: ViewGroup,
|
||||
|
|
|
@ -11,7 +11,6 @@ import androidx.annotation.VisibleForTesting.PRIVATE
|
|||
import androidx.core.content.ContextCompat.getColor
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
|
@ -54,7 +53,6 @@ import org.mozilla.fenix.utils.BrowsersCache
|
|||
* @param bookmarksStorage Used to check if a page is bookmarked.
|
||||
*/
|
||||
@Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
|
||||
@ExperimentalCoroutinesApi
|
||||
open class DefaultToolbarMenu(
|
||||
private val context: Context,
|
||||
private val store: BrowserStore,
|
||||
|
|
|
@ -6,7 +6,6 @@ package org.mozilla.fenix.components.toolbar
|
|||
|
||||
import android.view.View
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
|
@ -16,7 +15,6 @@ import mozilla.components.browser.toolbar.BrowserToolbar
|
|||
import mozilla.components.lib.state.ext.flowScoped
|
||||
import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class MenuPresenter(
|
||||
private val menuToolbar: BrowserToolbar,
|
||||
private val store: BrowserStore,
|
||||
|
|
|
@ -7,7 +7,6 @@ package org.mozilla.fenix.components.toolbar
|
|||
import android.content.Context
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.domains.autocomplete.DomainAutocompleteProvider
|
||||
import mozilla.components.browser.state.selector.normalTabs
|
||||
import mozilla.components.browser.state.selector.privateTabs
|
||||
|
@ -28,7 +27,6 @@ import org.mozilla.fenix.ext.components
|
|||
import org.mozilla.fenix.ext.settings
|
||||
import org.mozilla.fenix.theme.ThemeManager
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
abstract class ToolbarIntegration(
|
||||
context: Context,
|
||||
toolbar: BrowserToolbar,
|
||||
|
@ -77,7 +75,6 @@ abstract class ToolbarIntegration(
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class DefaultToolbarIntegration(
|
||||
context: Context,
|
||||
toolbar: BrowserToolbar,
|
||||
|
|
|
@ -5,13 +5,11 @@
|
|||
package org.mozilla.fenix.customtabs
|
||||
|
||||
import android.content.Context
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.feature.toolbar.ToolbarFeature
|
||||
import org.mozilla.fenix.components.toolbar.ToolbarIntegration
|
||||
import org.mozilla.fenix.components.toolbar.ToolbarMenu
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class CustomTabToolbarIntegration(
|
||||
context: Context,
|
||||
toolbar: BrowserToolbar,
|
||||
|
|
|
@ -11,7 +11,6 @@ import android.view.View
|
|||
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.SessionState
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.concept.engine.manifest.WebAppManifestParser
|
||||
|
@ -41,7 +40,6 @@ import org.mozilla.fenix.ext.settings
|
|||
/**
|
||||
* Fragment used for browsing the web within external apps.
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
||||
|
||||
private val args by navArgs<ExternalAppBrowserFragmentArgs>()
|
||||
|
|
|
@ -12,7 +12,6 @@ import androidx.fragment.app.Fragment
|
|||
import androidx.lifecycle.asLiveData
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.plus
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import org.mozilla.fenix.R
|
||||
|
@ -69,7 +68,6 @@ class LoginExceptionsFragment : Fragment() {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(exceptionsStore) {
|
||||
exceptionsView.update(it.items)
|
||||
|
|
|
@ -9,7 +9,6 @@ import android.view.LayoutInflater
|
|||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.fragment.app.Fragment
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import org.mozilla.fenix.HomeActivity
|
||||
import org.mozilla.fenix.R
|
||||
|
@ -61,7 +60,6 @@ class TrackingProtectionExceptionsFragment : Fragment() {
|
|||
return binding.root
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(exceptionsStore) {
|
||||
exceptionsView.update(it.items)
|
||||
|
|
|
@ -46,7 +46,6 @@ import com.google.android.material.button.MaterialButton
|
|||
import com.google.android.material.snackbar.Snackbar
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
@ -131,7 +130,6 @@ import org.mozilla.fenix.whatsnew.WhatsNew
|
|||
import java.lang.ref.WeakReference
|
||||
import kotlin.math.min
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("TooManyFunctions", "LargeClass")
|
||||
class HomeFragment : Fragment() {
|
||||
private val args by navArgs<HomeFragmentArgs>()
|
||||
|
|
|
@ -24,7 +24,6 @@ import androidx.navigation.fragment.navArgs
|
|||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.async
|
||||
import kotlinx.coroutines.awaitAll
|
||||
import kotlinx.coroutines.isActive
|
||||
|
@ -129,7 +128,6 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
val accountManager = requireComponents.backgroundServices.accountManager
|
||||
|
|
|
@ -16,7 +16,6 @@ import androidx.annotation.VisibleForTesting
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.browser.state.state.content.DownloadState
|
||||
|
@ -141,7 +140,6 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
|
|||
)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ import androidx.navigation.fragment.findNavController
|
|||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.browser.state.action.EngineAction
|
||||
import mozilla.components.browser.state.action.RecentlyClosedAction
|
||||
|
@ -142,7 +141,6 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
|
|||
)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ import android.view.ViewGroup
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import mozilla.components.support.base.feature.UserInteractionHandler
|
||||
import org.mozilla.fenix.HomeActivity
|
||||
|
@ -89,7 +88,6 @@ class HistoryMetadataGroupFragment :
|
|||
return binding.root
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(historyMetadataGroupStore) { state ->
|
||||
historyMetadataGroupView.update(state)
|
||||
|
|
|
@ -13,7 +13,6 @@ import android.view.MenuItem
|
|||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.map
|
||||
import mozilla.components.browser.state.state.recover.RecoverableTab
|
||||
|
@ -137,7 +136,6 @@ class RecentlyClosedFragment : LibraryPageFragment<RecoverableTab>(), UserIntera
|
|||
)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(recentlyClosedFragmentStore) { state ->
|
||||
recentlyClosedFragmentView.update(state)
|
||||
|
|
|
@ -12,7 +12,6 @@ import androidx.fragment.app.Fragment
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import mozilla.components.support.base.log.logger.Logger
|
||||
|
@ -61,7 +60,6 @@ class NimbusBranchesFragment : Fragment() {
|
|||
return view
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(nimbusBranchesStore) { state ->
|
||||
nimbusBranchesView.update(state)
|
||||
|
|
|
@ -35,7 +35,6 @@ import androidx.core.view.isVisible
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.launch
|
||||
|
@ -230,7 +229,6 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|||
}
|
||||
|
||||
@SuppressWarnings("LongMethod")
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
@ -354,20 +352,17 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
private fun observeSuggestionProvidersState() = consumeFlow(store) { flow ->
|
||||
flow.map { state -> state.toSearchProviderState() }
|
||||
.ifChanged()
|
||||
.collect { state -> awesomeBarView.updateSuggestionProvidersVisibility(state) }
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
private fun observeShortcutsState() = consumeFlow(store) { flow ->
|
||||
flow.ifAnyChanged { state -> arrayOf(state.areShortcutsAvailable, state.showSearchShortcuts) }
|
||||
.collect { state -> updateSearchShortcutsIcon(state.areShortcutsAvailable, state.showSearchShortcuts) }
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
private fun observeAwesomeBarState() = consumeFlow(store) { flow ->
|
||||
/*
|
||||
* firstUpdate is used to make sure we keep the awesomebar hidden on the first run
|
||||
|
@ -386,7 +381,6 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
private fun observeClipboardState() = consumeFlow(store) { flow ->
|
||||
flow.map { state ->
|
||||
val shouldShowView = state.showClipboardSuggestions &&
|
||||
|
|
|
@ -22,7 +22,6 @@ import androidx.preference.Preference
|
|||
import androidx.preference.PreferenceCategory
|
||||
import androidx.preference.PreferenceFragmentCompat
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.concept.sync.AccountObserver
|
||||
import mozilla.components.concept.sync.ConstellationState
|
||||
|
@ -85,7 +84,6 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
|
|||
requireComponents.analytics.metrics.track(Event.SyncAccountOpened)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ import android.view.ViewGroup
|
|||
import android.view.inputmethod.EditorInfo
|
||||
import androidx.appcompat.widget.SearchView
|
||||
import androidx.fragment.app.Fragment
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import mozilla.components.support.ktx.android.view.hideKeyboard
|
||||
import mozilla.components.support.locale.LocaleUseCases
|
||||
|
@ -96,7 +95,6 @@ class LocaleSettingsFragment : Fragment() {
|
|||
super.onPause()
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
consumeFrom(localeSettingsStore) {
|
||||
|
|
|
@ -11,7 +11,6 @@ import android.view.ViewGroup
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import org.mozilla.fenix.R
|
||||
|
@ -61,7 +60,6 @@ class CreditCardsManagementFragment : SecureFragment() {
|
|||
return view
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(creditCardsStore) { state ->
|
||||
if (!state.isLoading && state.creditCards.isEmpty()) {
|
||||
|
|
|
@ -21,7 +21,6 @@ import androidx.navigation.fragment.findNavController
|
|||
import androidx.preference.Preference
|
||||
import androidx.preference.SwitchPreference
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
|
@ -30,9 +29,9 @@ import org.mozilla.fenix.NavGraphDirections
|
|||
import org.mozilla.fenix.R
|
||||
import org.mozilla.fenix.components.StoreProvider
|
||||
import org.mozilla.fenix.ext.requireComponents
|
||||
import org.mozilla.fenix.ext.settings
|
||||
import org.mozilla.fenix.ext.runIfFragmentIsAttached
|
||||
import org.mozilla.fenix.ext.secure
|
||||
import org.mozilla.fenix.ext.settings
|
||||
import org.mozilla.fenix.ext.showToolbar
|
||||
import org.mozilla.fenix.settings.SharedPreferenceUpdater
|
||||
import org.mozilla.fenix.settings.SyncPreferenceView
|
||||
|
@ -99,7 +98,6 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
|
|||
return super.onCreateView(inflater, container, savedInstanceState)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
consumeFrom(creditCardsStore) { state ->
|
||||
|
|
|
@ -15,7 +15,6 @@ import kotlinx.coroutines.CoroutineScope
|
|||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
@ -96,7 +95,6 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onStart() {
|
||||
super.onStart()
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ import androidx.core.view.isVisible
|
|||
import androidx.fragment.app.Fragment
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import mozilla.components.support.ktx.android.view.hideKeyboard
|
||||
import org.mozilla.fenix.R
|
||||
|
@ -29,19 +28,18 @@ import org.mozilla.fenix.components.StoreProvider
|
|||
import org.mozilla.fenix.databinding.FragmentAddLoginBinding
|
||||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.fenix.ext.redirectToReAuth
|
||||
import org.mozilla.fenix.ext.settings
|
||||
import org.mozilla.fenix.ext.showToolbar
|
||||
import org.mozilla.fenix.ext.toEditable
|
||||
import org.mozilla.fenix.ext.settings
|
||||
import org.mozilla.fenix.settings.logins.controller.SavedLoginsStorageController
|
||||
import org.mozilla.fenix.settings.logins.interactor.AddLoginInteractor
|
||||
import org.mozilla.fenix.settings.logins.LoginsFragmentStore
|
||||
import org.mozilla.fenix.settings.logins.SavedLogin
|
||||
import org.mozilla.fenix.settings.logins.controller.SavedLoginsStorageController
|
||||
import org.mozilla.fenix.settings.logins.createInitialLoginsListState
|
||||
import org.mozilla.fenix.settings.logins.interactor.AddLoginInteractor
|
||||
|
||||
/**
|
||||
* Displays the editable new login information for a single website
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("TooManyFunctions", "NestedBlockDepth", "ForbiddenComment")
|
||||
class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ import androidx.fragment.app.Fragment
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import mozilla.components.support.ktx.android.view.hideKeyboard
|
||||
import org.mozilla.fenix.R
|
||||
|
@ -42,7 +41,6 @@ import org.mozilla.fenix.settings.logins.togglePasswordReveal
|
|||
/**
|
||||
* Displays the editable saved login information for a single website
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("TooManyFunctions", "NestedBlockDepth", "ForbiddenComment")
|
||||
class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
|
||||
|
||||
|
|
|
@ -21,8 +21,6 @@ import androidx.lifecycle.lifecycleScope
|
|||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.ObsoleteCoroutinesApi
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
import org.mozilla.fenix.BrowserDirection
|
||||
import org.mozilla.fenix.HomeActivity
|
||||
|
@ -50,7 +48,6 @@ import org.mozilla.fenix.settings.logins.view.LoginDetailsBindingDelegate
|
|||
* Displays saved login information for a single website.
|
||||
*/
|
||||
@Suppress("TooManyFunctions", "ForbiddenComment")
|
||||
@ExperimentalCoroutinesApi
|
||||
class LoginDetailFragment : Fragment(R.layout.fragment_login_detail) {
|
||||
|
||||
private val args by navArgs<LoginDetailFragmentArgs>()
|
||||
|
@ -81,8 +78,6 @@ class LoginDetailFragment : Fragment(R.layout.fragment_login_detail) {
|
|||
return view
|
||||
}
|
||||
|
||||
@ObsoleteCoroutinesApi
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
|
|
@ -20,7 +20,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
|
|||
import androidx.fragment.app.Fragment
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.concept.menu.MenuController
|
||||
import mozilla.components.concept.menu.Orientation
|
||||
import mozilla.components.lib.state.ext.consumeFrom
|
||||
|
@ -108,7 +107,6 @@ class SavedLoginsFragment : Fragment() {
|
|||
return view
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
consumeFrom(savedLoginsStore) {
|
||||
sortingStrategyMenu.updateMenu(savedLoginsStore.state.highlightedItem)
|
||||
|
|
|
@ -11,7 +11,6 @@ import android.view.ViewGroup
|
|||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.selector.findTabOrCustomTab
|
||||
import mozilla.components.browser.state.state.SessionState
|
||||
import org.mozilla.fenix.R
|
||||
|
@ -19,7 +18,6 @@ import org.mozilla.fenix.android.FenixDialogFragment
|
|||
import org.mozilla.fenix.databinding.FragmentConnectionDetailsDialogBinding
|
||||
import org.mozilla.fenix.ext.requireComponents
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class ConnectionPanelDialogFragment : FenixDialogFragment() {
|
||||
@VisibleForTesting
|
||||
private lateinit var connectionView: ConnectionDetailsView
|
||||
|
|
|
@ -17,7 +17,6 @@ import androidx.lifecycle.lifecycleScope
|
|||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
import kotlinx.coroutines.plus
|
||||
|
@ -121,7 +120,6 @@ class QuickSettingsSheetDialogFragment : FenixDialogFragment() {
|
|||
return rootView
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
observeTrackersChange(requireComponents.core.store)
|
||||
|
@ -182,7 +180,6 @@ class QuickSettingsSheetDialogFragment : FenixDialogFragment() {
|
|||
internal fun provideTabId(): String = args.sessionId
|
||||
|
||||
@VisibleForTesting
|
||||
@ExperimentalCoroutinesApi
|
||||
internal fun observeTrackersChange(store: BrowserStore) {
|
||||
consumeFlow(store) { flow ->
|
||||
flow.mapNotNull { state ->
|
||||
|
|
|
@ -8,7 +8,6 @@ import androidx.annotation.VisibleForTesting
|
|||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.navigation.NavController
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
|
@ -25,7 +24,6 @@ import org.mozilla.fenix.utils.Settings
|
|||
/**
|
||||
* Displays the [PwaOnboardingDialogFragment] info dialog when a PWA is opened in the browser for the third time.
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
class PwaOnboardingObserver(
|
||||
private val store: BrowserStore,
|
||||
private val lifecycleOwner: LifecycleOwner,
|
||||
|
|
|
@ -12,7 +12,6 @@ import androidx.navigation.fragment.findNavController
|
|||
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
|
||||
|
@ -33,7 +32,6 @@ class TabHistoryDialogFragment : BottomSheetDialogFragment() {
|
|||
savedInstanceState: Bundle?
|
||||
): View? = inflater.inflate(R.layout.fragment_tab_history_dialog, container, false)
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@ package org.mozilla.fenix.tabstray
|
|||
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.navigation.NavController
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.action.DebugAction
|
||||
import mozilla.components.browser.state.action.LastAccessAction
|
||||
import mozilla.components.browser.state.selector.findTab
|
||||
|
@ -156,7 +155,6 @@ class DefaultTabsTrayController(
|
|||
*
|
||||
* @param tabs List of [Tab]s (sessions) to be removed. This method has no effect for tabs that do not exist.
|
||||
*/
|
||||
@ExperimentalCoroutinesApi
|
||||
override fun handleMultipleTabsDeletion(tabs: Collection<Tab>) {
|
||||
val isPrivate = tabs.any { it.private }
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@ import androidx.navigation.fragment.findNavController
|
|||
import androidx.navigation.fragment.navArgs
|
||||
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialog
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import kotlinx.coroutines.flow.mapNotNull
|
||||
import kotlinx.coroutines.launch
|
||||
|
@ -48,7 +47,6 @@ import org.mozilla.fenix.ext.nav
|
|||
import org.mozilla.fenix.ext.requireComponents
|
||||
import org.mozilla.fenix.settings.SupportUtils
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Suppress("TooManyFunctions")
|
||||
class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ import io.mockk.mockk
|
|||
import io.mockk.mockkStatic
|
||||
import io.mockk.unmockkStatic
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.feature.intent.processing.IntentProcessor
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
|
@ -34,7 +33,6 @@ import org.mozilla.fenix.utils.Settings
|
|||
import org.robolectric.Robolectric
|
||||
import org.robolectric.Shadows.shadowOf
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class IntentReceiverActivityTest {
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ import io.mockk.spyk
|
|||
import io.mockk.verify
|
||||
import junit.framework.TestCase.assertFalse
|
||||
import junit.framework.TestCase.assertTrue
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.SessionState
|
||||
import mozilla.components.browser.state.state.content.DownloadState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
|
@ -30,7 +29,6 @@ import org.junit.runner.RunWith
|
|||
import org.mozilla.fenix.ext.settings
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class BaseBrowserFragmentTest {
|
||||
private lateinit var fragment: TestBaseBrowserFragment
|
||||
|
@ -197,7 +195,6 @@ class BaseBrowserFragmentTest {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
private class TestBaseBrowserFragment : BaseBrowserFragment() {
|
||||
override fun getContextMenuCandidates(
|
||||
context: Context,
|
||||
|
|
|
@ -14,7 +14,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.action.RestoreCompleteAction
|
||||
|
@ -47,7 +46,6 @@ import org.mozilla.fenix.onboarding.FenixOnboarding
|
|||
import org.mozilla.fenix.utils.Settings
|
||||
import java.lang.Exception
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class BrowserFragmentTest {
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
|
@ -36,7 +35,6 @@ import org.mozilla.fenix.browser.infobanner.DynamicInfoBanner
|
|||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class OpenInAppOnboardingObserverTest {
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ import io.mockk.MockKAnnotations
|
|||
import io.mockk.every
|
||||
import io.mockk.impl.annotations.MockK
|
||||
import kotlinx.coroutines.CompletableDeferred
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
import mozilla.components.lib.publicsuffixlist.PublicSuffixList
|
||||
|
@ -27,7 +26,6 @@ private const val SESSION_ID_MOZILLA = "0"
|
|||
private const val URL_BCC = "www.bcc.co.uk"
|
||||
private const val SESSION_ID_BCC = "1"
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class CollectionCreationFragmentTest {
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import io.mockk.every
|
|||
import io.mockk.impl.annotations.MockK
|
||||
import io.mockk.mockk
|
||||
import kotlinx.coroutines.CompletableDeferred
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.ReaderState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
|
@ -31,7 +30,6 @@ private const val SESSION_ID_BCC = "1"
|
|||
private const val SESSION_ID_BAD_1 = "not a real session id"
|
||||
private const val SESSION_ID_BAD_2 = "definitely not a real session id"
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class CollectionCreationStoreTest {
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@ import io.mockk.impl.annotations.MockK
|
|||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import io.mockk.verifyAll
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.browser.state.action.TabListAction
|
||||
|
@ -31,7 +30,6 @@ import org.mozilla.fenix.components.metrics.Event
|
|||
import org.mozilla.fenix.components.metrics.MetricController
|
||||
import org.mozilla.fenix.home.Tab
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class DefaultCollectionCreationControllerTest {
|
||||
|
||||
private val testCoroutineScope = TestCoroutineScope()
|
||||
|
|
|
@ -6,7 +6,6 @@ package org.mozilla.fenix.components
|
|||
|
||||
import com.google.android.play.core.review.ReviewManager
|
||||
import com.google.android.play.core.review.ReviewManagerFactory
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
import org.junit.Test
|
||||
|
@ -27,7 +26,6 @@ class TestReviewSettings(
|
|||
get() = isDefault
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class ReviewPromptControllerTest {
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ import io.mockk.coEvery
|
|||
import io.mockk.coVerify
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.appservices.places.BookmarkRoot
|
||||
import mozilla.components.concept.storage.BookmarkNode
|
||||
|
@ -19,7 +18,6 @@ import org.junit.Assert.assertTrue
|
|||
import org.junit.Test
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class BookmarksUseCaseTest {
|
||||
|
||||
@Test
|
||||
|
|
|
@ -11,7 +11,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
@ -24,7 +23,6 @@ import org.mozilla.fenix.ext.settings
|
|||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
import mozilla.components.browser.toolbar.behavior.ToolbarPosition as MozacToolbarPosition
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class BrowserToolbarViewTest {
|
||||
private lateinit var toolbarView: BrowserToolbarView
|
||||
|
|
|
@ -7,7 +7,6 @@ package org.mozilla.fenix.components.toolbar
|
|||
import io.mockk.clearMocks
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
|
@ -21,7 +20,6 @@ import org.junit.Before
|
|||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class MenuPresenterTest {
|
||||
|
||||
private lateinit var store: BrowserStore
|
||||
|
|
|
@ -7,7 +7,6 @@ package org.mozilla.fenix.customtabs
|
|||
import android.content.Context
|
||||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.CustomTabSessionState
|
||||
import mozilla.components.browser.state.state.createCustomTab
|
||||
|
@ -17,7 +16,6 @@ import org.junit.Assert.assertEquals
|
|||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class CustomTabToolbarMenuTest {
|
||||
|
||||
private lateinit var firefoxCustomTab: CustomTabSessionState
|
||||
|
|
|
@ -6,7 +6,6 @@ package org.mozilla.fenix.exceptions.login
|
|||
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.feature.logins.exceptions.LoginException
|
||||
|
@ -15,7 +14,6 @@ import org.junit.After
|
|||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class LoginExceptionsInteractorTest {
|
||||
|
||||
private lateinit var loginExceptionStorage: LoginExceptionStorage
|
||||
|
|
|
@ -9,7 +9,6 @@ import android.widget.FrameLayout
|
|||
import androidx.appcompat.view.ContextThemeWrapper
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
|
@ -24,7 +23,6 @@ import org.mozilla.fenix.exceptions.viewholders.ExceptionsHeaderViewHolder
|
|||
import org.mozilla.fenix.exceptions.viewholders.ExceptionsListItemViewHolder
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class TrackingProtectionExceptionsAdapterTest {
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.slot
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.action.EngineAction
|
||||
import mozilla.components.browser.state.action.MediaSessionAction
|
||||
|
@ -33,7 +32,6 @@ import org.junit.Test
|
|||
import org.junit.runner.RunWith
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class HistoryMetadataMiddlewareTest {
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ import io.mockk.coVerify
|
|||
import io.mockk.mockk
|
||||
import io.mockk.slot
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
import mozilla.components.concept.storage.DocumentType
|
||||
|
@ -21,7 +20,6 @@ import org.junit.Before
|
|||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class HistoryMetadataServiceTest {
|
||||
|
||||
private lateinit var service: HistoryMetadataService
|
||||
|
|
|
@ -9,7 +9,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.menu.view.MenuButton
|
||||
import org.junit.Assert
|
||||
import org.junit.Before
|
||||
|
@ -19,7 +18,6 @@ import org.mozilla.fenix.ext.application
|
|||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class HomeFragmentTest {
|
||||
|
||||
private lateinit var settings: Settings
|
||||
|
|
|
@ -10,7 +10,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.flow
|
||||
import kotlinx.coroutines.flow.flowOf
|
||||
|
@ -24,7 +23,6 @@ import org.mozilla.fenix.datastore.SelectedPocketStoriesCategories.SelectedPocke
|
|||
import org.mozilla.fenix.home.pocket.PocketRecommendedStoriesCategory
|
||||
import org.mozilla.fenix.home.pocket.PocketRecommendedStoriesSelectedCategory
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class PocketUpdatesMiddlewareTest {
|
||||
@Test
|
||||
fun `WHEN PocketStoriesShown is dispatched THEN update PocketStoriesService`() {
|
||||
|
|
|
@ -11,7 +11,6 @@ import io.mockk.mockk
|
|||
import io.mockk.mockkObject
|
||||
import io.mockk.verify
|
||||
import io.mockk.unmockkObject
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.service.fxa.manager.MigrationResult
|
||||
|
@ -30,7 +29,6 @@ import org.mozilla.fenix.databinding.OnboardingAutomaticSigninBinding
|
|||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class OnboardingAutomaticSignInViewHolderTest {
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ import io.mockk.slot
|
|||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import io.mockk.verifyOrder
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import mozilla.appservices.places.BookmarkRoot
|
||||
import mozilla.components.concept.storage.BookmarkNode
|
||||
|
@ -42,7 +41,6 @@ import org.mozilla.fenix.ext.bookmarkStorage
|
|||
import org.mozilla.fenix.ext.components
|
||||
|
||||
@Suppress("TooManyFunctions", "LargeClass")
|
||||
@ExperimentalCoroutinesApi
|
||||
class BookmarkControllerTest {
|
||||
|
||||
private val bookmarkStore = spyk(BookmarkFragmentStore(BookmarkFragmentState(null)))
|
||||
|
|
|
@ -7,7 +7,6 @@ package org.mozilla.fenix.library.downloads
|
|||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import mozilla.components.browser.state.state.content.DownloadState
|
||||
import org.junit.After
|
||||
|
@ -18,7 +17,6 @@ import org.junit.Before
|
|||
import org.junit.Test
|
||||
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class DownloadControllerTest {
|
||||
private val downloadItem = DownloadItem(
|
||||
id = "0",
|
||||
|
|
|
@ -9,7 +9,6 @@ import io.mockk.coVerifyOrder
|
|||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
|
@ -21,7 +20,6 @@ import org.junit.runner.RunWith
|
|||
import org.mozilla.fenix.components.metrics.MetricController
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class HistoryControllerTest {
|
||||
private val historyItem = History.Regular(0, "title", "url", 0.toLong())
|
||||
|
|
|
@ -9,7 +9,6 @@ import io.mockk.coVerify
|
|||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
|
@ -34,7 +33,6 @@ import org.mozilla.fenix.library.historymetadata.HistoryMetadataGroupFragmentAct
|
|||
import org.mozilla.fenix.library.historymetadata.HistoryMetadataGroupFragmentDirections
|
||||
import org.mozilla.fenix.library.historymetadata.HistoryMetadataGroupFragmentStore
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class HistoryMetadataGroupControllerTest {
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ import io.mockk.every
|
|||
import io.mockk.just
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.RecentlyClosedAction
|
||||
import mozilla.components.browser.state.state.recover.RecoverableTab
|
||||
|
@ -30,7 +29,6 @@ import org.mozilla.fenix.ext.directionsEq
|
|||
import org.mozilla.fenix.ext.optionsEq
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class DefaultRecentlyClosedControllerTest {
|
||||
private val dispatcher = TestCoroutineDispatcher()
|
||||
|
|
|
@ -8,7 +8,6 @@ import io.mockk.MockKAnnotations
|
|||
import io.mockk.impl.annotations.MockK
|
||||
import io.mockk.verify
|
||||
import io.mockk.verifyOrder
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.support.base.log.logger.Logger
|
||||
|
@ -23,7 +22,6 @@ import org.junit.Test
|
|||
import org.mozilla.fenix.components.metrics.Event
|
||||
import org.mozilla.fenix.components.metrics.MetricController
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class MigrationTelemetryListenerTest {
|
||||
|
||||
private val testDispatcher = TestCoroutineDispatcher()
|
||||
|
|
|
@ -17,7 +17,6 @@ import io.mockk.mockkStatic
|
|||
import io.mockk.slot
|
||||
import io.mockk.unmockkStatic
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.concept.engine.Engine
|
||||
|
@ -35,7 +34,6 @@ import org.junit.Assert.assertTrue
|
|||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class WebPushEngineIntegrationTest {
|
||||
|
||||
private val scope = TestCoroutineScope()
|
||||
|
|
|
@ -15,7 +15,6 @@ import io.mockk.mockkObject
|
|||
import io.mockk.spyk
|
||||
import io.mockk.unmockkObject
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.browser.state.action.BrowserAction
|
||||
import mozilla.components.browser.state.action.TabListAction
|
||||
|
@ -41,7 +40,6 @@ import org.mozilla.fenix.search.SearchDialogFragmentDirections.Companion.actionG
|
|||
import org.mozilla.fenix.settings.SupportUtils
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class SearchDialogControllerTest {
|
||||
|
||||
@MockK(relaxed = true) private lateinit var activity: HomeActivity
|
||||
|
|
|
@ -6,13 +6,11 @@ package org.mozilla.fenix.search
|
|||
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.browser.state.search.SearchEngine
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class SearchDialogInteractorTest {
|
||||
|
||||
lateinit var searchController: SearchDialogController
|
||||
|
|
|
@ -8,7 +8,6 @@ import io.mockk.MockKAnnotations
|
|||
import io.mockk.every
|
||||
import io.mockk.impl.annotations.MockK
|
||||
import io.mockk.mockk
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import mozilla.components.browser.state.search.RegionState
|
||||
import mozilla.components.browser.state.search.SearchEngine
|
||||
|
@ -32,7 +31,6 @@ import org.mozilla.fenix.components.Components
|
|||
import org.mozilla.fenix.components.metrics.Event.PerformedSearch.SearchAccessPoint
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class SearchFragmentStoreTest {
|
||||
|
||||
@MockK private lateinit var searchEngine: SearchEngine
|
||||
|
|
|
@ -10,7 +10,6 @@ import io.mockk.every
|
|||
import io.mockk.mockk
|
||||
import io.mockk.mockkStatic
|
||||
import io.mockk.unmockkStatic
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.browser.state.search.SearchEngine
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
|
@ -23,7 +22,6 @@ import org.junit.Before
|
|||
import org.junit.Test
|
||||
import org.mozilla.fenix.R
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class ShortcutsSuggestionProviderTest {
|
||||
|
||||
private lateinit var context: Context
|
||||
|
|
|
@ -8,7 +8,6 @@ import android.content.ComponentName
|
|||
import android.content.Intent
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
|
@ -32,7 +31,6 @@ import org.robolectric.Robolectric
|
|||
import org.robolectric.Shadows.shadowOf
|
||||
import org.robolectric.android.controller.ServiceController
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class PrivateNotificationServiceTest {
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import androidx.preference.Preference
|
|||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.mockkObject
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
import mozilla.components.support.test.rule.MainCoroutineRule
|
||||
|
@ -31,7 +30,6 @@ import org.mozilla.fenix.utils.Settings
|
|||
import org.robolectric.Robolectric
|
||||
import java.io.IOException
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class SettingsFragmentTest {
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import androidx.navigation.NavController
|
|||
import androidx.preference.Preference
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.concept.storage.CreditCard
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
|
@ -24,7 +23,6 @@ import org.mozilla.fenix.ext.getPreferenceKey
|
|||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
import org.robolectric.Robolectric
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class CreditCardsSettingFragmentTest {
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import io.mockk.coVerify
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
|
@ -27,7 +26,6 @@ import org.mozilla.fenix.components.metrics.Event
|
|||
import org.mozilla.fenix.components.metrics.MetricController
|
||||
import org.mozilla.fenix.settings.creditcards.controller.DefaultCreditCardEditorController
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class DefaultCreditCardEditorControllerTest {
|
||||
|
||||
private val storage: AutofillCreditCardsAddressesStorage = mockk(relaxed = true)
|
||||
|
|
|
@ -10,7 +10,6 @@ import io.mockk.coEvery
|
|||
import io.mockk.coVerify
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
|
@ -31,7 +30,6 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
|||
import org.mozilla.fenix.settings.logins.controller.SavedLoginsStorageController
|
||||
import org.mozilla.fenix.settings.logins.fragment.EditLoginFragmentDirections
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class SavedLoginsStorageControllerTest {
|
||||
val testDispatcher = TestCoroutineDispatcher()
|
||||
|
|
|
@ -15,7 +15,6 @@ import io.mockk.mockk
|
|||
import io.mockk.slot
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.state.TabSessionState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
import mozilla.components.concept.engine.permission.SitePermissions
|
||||
|
@ -27,7 +26,6 @@ import org.junit.runner.RunWith
|
|||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class DefaultConnectionDetailsControllerTest {
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ import io.mockk.just
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
|
@ -49,7 +48,6 @@ import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled
|
|||
import org.mozilla.fenix.settings.toggle
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class DefaultQuickSettingsControllerTest {
|
||||
private val context = spyk(testContext)
|
||||
|
|
|
@ -11,7 +11,6 @@ import io.mockk.impl.annotations.MockK
|
|||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.content.PermissionHighlightsState
|
||||
|
@ -233,7 +232,6 @@ class QuickSettingsFragmentStoreTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
@ExperimentalCoroutinesApi
|
||||
fun `TogglePermission should only modify status and visibility of a specific WebsitePermissionsState`() =
|
||||
runBlocking {
|
||||
val initialCameraStatus = "initialCameraStatus"
|
||||
|
|
|
@ -13,7 +13,6 @@ import io.mockk.slot
|
|||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import junit.framework.TestCase.assertNotSame
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.TabListAction
|
||||
import mozilla.components.browser.state.action.TrackingProtectionAction.TrackerBlockedAction
|
||||
|
@ -33,7 +32,6 @@ import org.junit.Test
|
|||
import org.junit.runner.RunWith
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class QuickSettingsSheetDialogFragmentTest {
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@ import io.mockk.mockk
|
|||
import io.mockk.runs
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.service.nimbus.NimbusApi
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
@ -20,7 +19,6 @@ import org.mozilla.experiments.nimbus.internal.EnrolledExperiment
|
|||
import org.mozilla.fenix.BrowserDirection
|
||||
import org.mozilla.fenix.HomeActivity
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class DefaultStudiesInteractorTest {
|
||||
@RelaxedMockK
|
||||
private lateinit var activity: HomeActivity
|
||||
|
|
|
@ -19,7 +19,6 @@ import io.mockk.verify
|
|||
import junit.framework.TestCase.assertEquals
|
||||
import junit.framework.TestCase.assertFalse
|
||||
import junit.framework.TestCase.assertTrue
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
@ -31,7 +30,6 @@ import org.mozilla.fenix.settings.studies.CustomViewHolder.SectionViewHolder
|
|||
import org.mozilla.fenix.settings.studies.CustomViewHolder.StudyViewHolder
|
||||
import org.mozilla.fenix.settings.studies.StudiesAdapter.Section
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class StudiesAdapterTest {
|
||||
@RelaxedMockK
|
||||
|
|
|
@ -15,7 +15,6 @@ import io.mockk.mockk
|
|||
import io.mockk.runs
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import mozilla.components.service.nimbus.NimbusApi
|
||||
|
@ -32,7 +31,6 @@ import org.mozilla.fenix.databinding.SettingsStudiesBinding
|
|||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class StudiesViewTest {
|
||||
@RelaxedMockK
|
||||
|
|
|
@ -18,7 +18,6 @@ import io.mockk.slot
|
|||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import io.mockk.verifyOrder
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
|
@ -48,7 +47,6 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
|||
import org.mozilla.fenix.share.listadapters.AppShareOption
|
||||
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
@ExperimentalCoroutinesApi
|
||||
class ShareControllerTest {
|
||||
// Need a valid context to retrieve Strings for example, but we also need it to return our "metrics"
|
||||
private val context: Context = spyk(testContext)
|
||||
|
|
|
@ -19,7 +19,6 @@ import io.mockk.mockk
|
|||
import io.mockk.mockkStatic
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
|
@ -42,7 +41,6 @@ import org.mozilla.fenix.share.listadapters.SyncShareOption
|
|||
import org.robolectric.shadows.ShadowLooper
|
||||
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
@ExperimentalCoroutinesApi
|
||||
class ShareViewModelTest {
|
||||
|
||||
private val packageName = "org.mozilla.fenix"
|
||||
|
|
|
@ -11,7 +11,6 @@ import androidx.navigation.NavController
|
|||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
|
@ -28,7 +27,6 @@ import org.junit.runner.RunWith
|
|||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class PwaOnboardingObserverTest {
|
||||
|
||||
|
|
|
@ -16,7 +16,6 @@ import io.mockk.spyk
|
|||
import io.mockk.unmockkStatic
|
||||
import io.mockk.verify
|
||||
import io.mockk.verifyOrder
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import mozilla.components.browser.state.selector.findTab
|
||||
import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
|
||||
import mozilla.components.browser.state.state.TabSessionState
|
||||
|
@ -257,7 +256,6 @@ class DefaultTabsTrayControllerTest {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Test
|
||||
fun `WHEN handleMultipleTabsDeletion is called to close all private tabs THEN that it navigates to home where that tabs will be removed and shows undo snackbar`() {
|
||||
var showUndoSnackbarForTabInvoked = false
|
||||
|
@ -288,7 +286,6 @@ class DefaultTabsTrayControllerTest {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Test
|
||||
fun `WHEN handleMultipleTabsDeletion is called to close all normal tabs THEN that it navigates to home where that tabs will be removed and shows undo snackbar`() {
|
||||
var showUndoSnackbarForTabInvoked = false
|
||||
|
@ -318,7 +315,6 @@ class DefaultTabsTrayControllerTest {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Test
|
||||
fun `WHEN handleMultipleTabsDeletion is called to close some private tabs THEN that it uses tabsUseCases#removeTabs and shows an undo snackbar`() {
|
||||
var showUndoSnackbarForTabInvoked = false
|
||||
|
@ -342,7 +338,6 @@ class DefaultTabsTrayControllerTest {
|
|||
}
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Test
|
||||
fun `WHEN handleMultipleTabsDeletion is called to close some normal tabs THEN that it uses tabsUseCases#removeTabs and shows an undo snackbar`() {
|
||||
var showUndoSnackbarForTabInvoked = false
|
||||
|
@ -398,7 +393,6 @@ class DefaultTabsTrayControllerTest {
|
|||
assertTrue(navigateToHomeAndDeleteSessionInvoked)
|
||||
}
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@Test
|
||||
fun `WHEN deleteAllInactiveTabs is called THEN that it uses tabsUseCases#removeTabs and shows an undo snackbar`() {
|
||||
var showUndoSnackbarForTabInvoked = false
|
||||
|
|
|
@ -10,19 +10,16 @@ import androidx.navigation.NavDirections
|
|||
import io.mockk.coVerify
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import io.mockk.mockkStatic
|
||||
import io.mockk.unmockkStatic
|
||||
import io.mockk.verify
|
||||
import io.mockk.verifyOrder
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.TabSessionState
|
||||
import mozilla.components.browser.state.state.createTab as createStateTab
|
||||
import mozilla.components.browser.state.store.BrowserStore
|
||||
import mozilla.components.browser.storage.sync.TabEntry
|
||||
import mozilla.components.browser.storage.sync.Tab as SyncTab
|
||||
import mozilla.components.service.fxa.manager.FxaAccountManager
|
||||
import mozilla.components.support.test.rule.MainCoroutineRule
|
||||
import org.junit.Assert.assertTrue
|
||||
|
@ -37,9 +34,10 @@ import org.mozilla.fenix.components.TabCollectionStorage
|
|||
import org.mozilla.fenix.components.bookmarks.BookmarksUseCase
|
||||
import org.mozilla.fenix.components.metrics.Event
|
||||
import org.mozilla.fenix.components.metrics.MetricController
|
||||
import mozilla.components.browser.state.state.createTab as createStateTab
|
||||
import mozilla.components.browser.storage.sync.Tab as SyncTab
|
||||
import org.mozilla.fenix.tabstray.browser.createTab as createTrayTab
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class NavigationInteractorTest {
|
||||
private lateinit var store: BrowserStore
|
||||
private lateinit var tabsTrayStore: TabsTrayStore
|
||||
|
|
|
@ -7,12 +7,11 @@ package org.mozilla.fenix.telemetry
|
|||
import androidx.test.core.app.ApplicationProvider
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.engine.EngineMiddleware
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.action.EngineAction
|
||||
import mozilla.components.browser.state.action.TabListAction
|
||||
import mozilla.components.browser.state.engine.EngineMiddleware
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
import mozilla.components.browser.state.state.recover.RecoverableTab
|
||||
|
@ -38,7 +37,6 @@ import org.mozilla.fenix.utils.Settings
|
|||
import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics
|
||||
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
@ExperimentalCoroutinesApi
|
||||
class TelemetryMiddlewareTest {
|
||||
|
||||
private lateinit var store: BrowserStore
|
||||
|
|
|
@ -12,7 +12,6 @@ import io.mockk.mockk
|
|||
import io.mockk.mockkStatic
|
||||
import io.mockk.spyk
|
||||
import io.mockk.unmockkStatic
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
import mozilla.components.browser.state.state.createTab
|
||||
|
@ -29,7 +28,6 @@ import org.junit.Test
|
|||
import org.mozilla.fenix.components.toolbar.DefaultToolbarMenu
|
||||
import org.mozilla.fenix.ext.settings
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
class DefaultToolbarMenuTest {
|
||||
|
||||
private lateinit var store: BrowserStore
|
||||
|
|
|
@ -12,7 +12,6 @@ import io.mockk.mockk
|
|||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import junit.framework.TestCase.assertNotSame
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.action.TabListAction
|
||||
|
@ -31,7 +30,6 @@ import org.junit.Test
|
|||
import org.junit.runner.RunWith
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class TrackingProtectionPanelDialogFragmentTest {
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
package org.mozilla.fenix.utils
|
||||
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.state.BrowserState
|
||||
|
@ -20,7 +19,6 @@ import org.junit.Test
|
|||
import org.junit.runner.RunWith
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class ToolbarPopupWindowTest {
|
||||
private val testDispatcher = TestCoroutineDispatcher()
|
||||
|
|
|
@ -15,7 +15,6 @@ import android.speech.RecognizerIntent.EXTRA_RESULTS
|
|||
import android.speech.RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
|
||||
import androidx.appcompat.app.AppCompatActivity.RESULT_OK
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertNull
|
||||
|
@ -35,7 +34,6 @@ import org.robolectric.Shadows.shadowOf
|
|||
import org.robolectric.android.controller.ActivityController
|
||||
import org.robolectric.shadows.ShadowActivity
|
||||
|
||||
@ExperimentalCoroutinesApi
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class VoiceSearchActivityTest {
|
||||
|
||||
|
|
|
@ -144,7 +144,6 @@ allprojects {
|
|||
kotlinOptions.jvmTarget = "1.8"
|
||||
kotlinOptions.allWarningsAsErrors = true
|
||||
kotlinOptions.freeCompilerArgs += [
|
||||
"-Xuse-experimental=kotlin.Experimental",
|
||||
"-Xopt-in=kotlin.RequiresOptIn"
|
||||
]
|
||||
}
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
object AndroidComponents {
|
||||
const val VERSION = "95.0.20211024143057"
|
||||
const val VERSION = "95.0.20211025112631"
|
||||
}
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
object Versions {
|
||||
const val kotlin = "1.5.10"
|
||||
const val coroutines = "1.5.0"
|
||||
const val kotlin = "1.5.30"
|
||||
const val coroutines = "1.5.2"
|
||||
|
||||
// These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
|
||||
// https://github.com/alexjlockwood/android-lint-checks-demo/blob/0245fc027463137b1b4afb97c5295d60dce998b6/dependencies.gradle#L3
|
||||
|
@ -17,8 +17,8 @@ object Versions {
|
|||
const val detekt = "1.17.1"
|
||||
const val jna = "5.6.0"
|
||||
|
||||
const val androidx_activity_compose = "1.3.0"
|
||||
const val androidx_compose = "1.0.0"
|
||||
const val androidx_activity_compose = "1.3.1"
|
||||
const val androidx_compose = "1.0.3"
|
||||
const val androidx_appcompat = "1.3.0"
|
||||
const val androidx_benchmark = "1.0.0"
|
||||
const val androidx_biometric = "1.1.0"
|
||||
|
|
|
@ -46,6 +46,11 @@ workers:
|
|||
implementation: docker-worker
|
||||
os: linux
|
||||
worker-type: b-linux-large
|
||||
b-android-xlarge:
|
||||
provisioner: 'mobile-{level}'
|
||||
implementation: docker-worker
|
||||
os: linux
|
||||
worker-type: b-linux-xlarge
|
||||
dep-signing:
|
||||
provisioner: scriptworker-k8s
|
||||
implementation: scriptworker-signing
|
||||
|
|
|
@ -60,4 +60,4 @@ linux64-android-gradle-dependencies:
|
|||
- type: directory
|
||||
name: public/logs/nexus
|
||||
path: /opt/sonatype/nexus/logs
|
||||
worker-type: b-android-large
|
||||
worker-type: b-android-xlarge
|
||||
|
|
Loading…
Reference in New Issue