diff --git a/app/build.gradle b/app/build.gradle index 54b726711..f88212a5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt index a55623712..e4cb41da5 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/WebExtensionActionPopupFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index b8ed7184f..37531fc20 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -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(), diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index f7cc41432..d1b44d2a7 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -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 { diff --git a/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt b/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt index 692d02289..c1792b1fa 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt index ce8caddec..3618e4295 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt @@ -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 diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index 8e15bb609..a273ae3fb 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 01e6c28b3..abcb338f0 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt index 36e492d21..440774307 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index c0dd32aeb..2020fa455 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarIntegration.kt index 46acddb88..4d85fdcb6 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarIntegration.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt index 13c13eda3..6a052462a 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt @@ -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() diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/login/LoginExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/exceptions/login/LoginExceptionsFragment.kt index 1708d0127..e4afe9634 100644 --- a/app/src/main/java/org/mozilla/fenix/exceptions/login/LoginExceptionsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/exceptions/login/LoginExceptionsFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsFragment.kt index 3c04aefd5..5b24673de 100644 --- a/app/src/main/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 148e15e97..49c7ac4e8 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -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() diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 4336027e9..5cb66e7a4 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -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(), UserInteractionHan } } - @ExperimentalCoroutinesApi override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) val accountManager = requireComponents.backgroundServices.accountManager diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt index 02de5fa02..8991e1fe6 100644 --- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt @@ -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(), UserInteractionHan ) } - @ExperimentalCoroutinesApi override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 4bc175435..b123bf6bc 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -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(), UserInteractionHandler { ) } - @ExperimentalCoroutinesApi override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt index fdf68108f..609cd5045 100644 --- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt index e825e05ba..fc5114e09 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt @@ -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(), UserIntera ) } - @ExperimentalCoroutinesApi override fun onViewCreated(view: View, savedInstanceState: Bundle?) { consumeFrom(recentlyClosedFragmentStore) { state -> recentlyClosedFragmentView.update(state) diff --git a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt index 235b3f27b..45a6d5d90 100644 --- a/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/nimbus/NimbusBranchesFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index a5c11f99b..b405e6d31 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -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 && diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt index 3af277d33..f8fd162c3 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt index 6e951e476..1729cdfbc 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt @@ -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) { diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt index fdf4cf9a2..49b31f85b 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementFragment.kt @@ -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()) { diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt index c2b444b1e..aeef91c46 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt @@ -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 -> diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt index f12aae7f1..1e5280a11 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt @@ -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() diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt index a2566b880..0c891032a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt @@ -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) { diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt index 3eeb2c232..4d6e5b35d 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt @@ -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) { diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt index b9b7d5592..9646dee2f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/LoginDetailFragment.kt @@ -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() @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt index 587e6c05d..47907b93f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionPanelDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionPanelDialogFragment.kt index d47bdb945..4ee4b053d 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionPanelDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionPanelDialogFragment.kt @@ -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 diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt index 1d86c2b00..96b915be0 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt @@ -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 -> diff --git a/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt b/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt index 271e71834..04c77b1b1 100644 --- a/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt +++ b/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt @@ -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, diff --git a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryDialogFragment.kt index f8b3cb278..62e706e4e 100644 --- a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryDialogFragment.kt @@ -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) diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt index 7c6c388ef..120f7619c 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt @@ -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) { val isPrivate = tabs.any { it.private } diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt index 9a6476323..1e1452548 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt b/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt index 271736386..015bdd437 100644 --- a/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt index 614df23d3..4370091c7 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt @@ -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, diff --git a/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt index dded5abc6..773f1d346 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt b/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt index 5ddf312bf..ff63a6248 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt index b3da204fe..f28ff98d6 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt index 52bdd899e..86d2c5d81 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt index 0ab9a4e98..167f7f903 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt @@ -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() diff --git a/app/src/test/java/org/mozilla/fenix/components/ReviewPromptControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/ReviewPromptControllerTest.kt index 5668fa4b6..854e7f7d7 100644 --- a/app/src/test/java/org/mozilla/fenix/components/ReviewPromptControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/ReviewPromptControllerTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt b/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt index 5ccd28c17..2e18ad64e 100644 --- a/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt index 727f4f6a8..467f28d0e 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/MenuPresenterTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/MenuPresenterTest.kt index e38ce6f75..ed7ea70c1 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/MenuPresenterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/MenuPresenterTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenuTest.kt b/app/src/test/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenuTest.kt index 5795d1655..ce0b8126a 100644 --- a/app/src/test/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenuTest.kt +++ b/app/src/test/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenuTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/exceptions/login/LoginExceptionsInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/exceptions/login/LoginExceptionsInteractorTest.kt index 92fc23bce..1072e01e0 100644 --- a/app/src/test/java/org/mozilla/fenix/exceptions/login/LoginExceptionsInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/exceptions/login/LoginExceptionsInteractorTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsAdapterTest.kt index c4cd97501..959884833 100644 --- a/app/src/test/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/exceptions/trackingprotection/TrackingProtectionExceptionsAdapterTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt index ece8c760d..ecf2416de 100644 --- a/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataServiceTest.kt b/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataServiceTest.kt index cbe6f3769..b587a9950 100644 --- a/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataServiceTest.kt +++ b/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataServiceTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt index f9c403d9e..079283037 100644 --- a/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/home/PocketUpdatesMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/home/PocketUpdatesMiddlewareTest.kt index 1f278ffff..c955b167d 100644 --- a/app/src/test/java/org/mozilla/fenix/home/PocketUpdatesMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/PocketUpdatesMiddlewareTest.kt @@ -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`() { diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt index 3e1fd9f58..590ef34fd 100644 --- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt index cdcd6dcaf..b848a3367 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt @@ -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))) diff --git a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt index 6416cfda0..73b0ee1d6 100644 --- a/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/downloads/DownloadControllerTest.kt @@ -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", diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt index a17cabe1c..3e1b8f3df 100644 --- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt @@ -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()) diff --git a/app/src/test/java/org/mozilla/fenix/library/historymetadata/controller/HistoryMetadataGroupControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/historymetadata/controller/HistoryMetadataGroupControllerTest.kt index a579d1ad7..43e2bf431 100644 --- a/app/src/test/java/org/mozilla/fenix/library/historymetadata/controller/HistoryMetadataGroupControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/historymetadata/controller/HistoryMetadataGroupControllerTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt index 710c2a38b..73df2cbcb 100644 --- a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt @@ -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() diff --git a/app/src/test/java/org/mozilla/fenix/migration/MigrationTelemetryListenerTest.kt b/app/src/test/java/org/mozilla/fenix/migration/MigrationTelemetryListenerTest.kt index 5bee4e175..c6ae33121 100644 --- a/app/src/test/java/org/mozilla/fenix/migration/MigrationTelemetryListenerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/migration/MigrationTelemetryListenerTest.kt @@ -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() diff --git a/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt b/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt index 999ceda59..90abdc32a 100644 --- a/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt +++ b/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt @@ -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() diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt index 32743ca8a..09c9add78 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogInteractorTest.kt index b3e842111..897fd669a 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogInteractorTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt index 5aa34c643..2e835b91d 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt index 85686f0db..3a8b516e2 100644 --- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/session/PrivateNotificationServiceTest.kt b/app/src/test/java/org/mozilla/fenix/session/PrivateNotificationServiceTest.kt index 6fff1bdb0..38fbfa4a8 100644 --- a/app/src/test/java/org/mozilla/fenix/session/PrivateNotificationServiceTest.kt +++ b/app/src/test/java/org/mozilla/fenix/session/PrivateNotificationServiceTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/settings/SettingsFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/settings/SettingsFragmentTest.kt index 8de7ca2b6..340147f5c 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/SettingsFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/SettingsFragmentTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt index 4b9edac6b..92ac2a478 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragmentTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt index ffb5214f8..7b4d0d548 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardEditorControllerTest.kt @@ -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) diff --git a/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt index 55933bd33..04c30f1c4 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt @@ -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() diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultConnectionDetailsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultConnectionDetailsControllerTest.kt index 61d7a5068..c1eb22df1 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultConnectionDetailsControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultConnectionDetailsControllerTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt index 60458d9f5..5644ce5d0 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt @@ -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) diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt index 3a231abfa..acd017077 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt @@ -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" diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt index a4fa119ef..9fc24507a 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/settings/studies/DefaultStudiesInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/settings/studies/DefaultStudiesInteractorTest.kt index 3b90fc4c0..8ea3b06c8 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/studies/DefaultStudiesInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/studies/DefaultStudiesInteractorTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesAdapterTest.kt index c6b70d98a..547184afb 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesAdapterTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesViewTest.kt index 9deca9156..d1ced96f2 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/studies/StudiesViewTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt index 1fd46f9f5..1a9afc9b6 100644 --- a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt @@ -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) diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt index 96bb24ed2..9ad7d78cc 100644 --- a/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt @@ -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" diff --git a/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt b/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt index c1152835a..64201d91e 100644 --- a/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt +++ b/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt index 025f5617c..70af10a89 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt index 904fcc27c..3da0f95d8 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt index e49096c0f..da05c59fe 100644 --- a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt b/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt index 2a42b741f..c2dd37d9c 100644 --- a/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt +++ b/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt @@ -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 diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragmentTest.kt index 49f9b453e..9e4520b13 100644 --- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragmentTest.kt @@ -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 { diff --git a/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt b/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt index d56f1b50b..ffc17a5ff 100644 --- a/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt +++ b/app/src/test/java/org/mozilla/fenix/utils/ToolbarPopupWindowTest.kt @@ -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() diff --git a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt index 21f9cd7d1..667ea82dd 100644 --- a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt @@ -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 { diff --git a/build.gradle b/build.gradle index 97d34e817..6c5178971 100644 --- a/build.gradle +++ b/build.gradle @@ -144,7 +144,6 @@ allprojects { kotlinOptions.jvmTarget = "1.8" kotlinOptions.allWarningsAsErrors = true kotlinOptions.freeCompilerArgs += [ - "-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn" ] } diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index be1fca5b4..1c8434cd5 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -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" } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 42f259f37..796d7f0a6 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -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" diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml index d496e51cb..520e6bf07 100644 --- a/taskcluster/ci/config.yml +++ b/taskcluster/ci/config.yml @@ -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 diff --git a/taskcluster/ci/toolchain/android.yml b/taskcluster/ci/toolchain/android.yml index a9377b3c1..685c45b85 100644 --- a/taskcluster/ci/toolchain/android.yml +++ b/taskcluster/ci/toolchain/android.yml @@ -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