For #11753 - Update compose to 1.1.0 and Kotlin to 1.6.10

buildSrc/src/main/java/Dependencies.kt

@@ -7,7 +7,7 @@
 
 // Synchronized version numbers for dependencies used by (some) modules
 object Versions {
-    const val kotlin = "1.5.31"
+    const val kotlin = "1.6.10"
     const val coroutines = "1.5.2"
 
     const val junit = "4.12"
@@ -35,7 +35,7 @@ object Versions {
 
     const val material = "1.2.1"
 
-    const val compose_version = "1.0.5"
+    const val compose_version = "1.1.0"
 
     object AndroidX {
         const val activityCompose = "1.4.0"
@@ -54,7 +54,7 @@ object Versions {
         const val test = "1.3.0"
         const val test_ext = "1.1.2"
         const val espresso = "3.3.0"
-        const val room = "2.3.0"
+        const val room = "2.4.1"
         const val paging = "2.1.2"
         const val palette = "1.0.0"
         const val preferences = "1.1.1"

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt

@@ -587,6 +587,9 @@ class GeckoEngineSession(
                                 onLaunchIntentRequest(url = url, appIntent = appIntent)
                             }
                         }
+                        else -> {
+                            // no-op
+                        }
                     }
                 }
             } else {

components/browser/menu/src/main/java/mozilla/components/browser/menu/BrowserMenu.kt

@@ -261,6 +261,9 @@ internal fun PopupWindow.displayPopup(currentData: MenuPositioningData) {
 
         is BrowserMenuPlacement.AnchoredToTop.ManualAnchoring,
         is BrowserMenuPlacement.AnchoredToBottom.ManualAnchoring -> showAtAnchorLocation(currentData)
+        else -> {
+            // no-op
+        }
     }
 }
 

components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/LinkingMiddleware.kt

@@ -48,6 +48,9 @@ internal class LinkingMiddleware(
             is EngineAction.UnlinkEngineSessionAction -> {
                 unlink(context, action)
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)
@@ -58,6 +61,9 @@ internal class LinkingMiddleware(
                     engineObserver = link(context, action.engineSession, tab, action.skipLoading)
                 }
             }
+            else -> {
+                // no-op
+            }
         }
 
         engineObserver?.let {

components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/TabsRemovedMiddleware.kt

@@ -47,6 +47,9 @@ internal class TabsRemovedMiddleware(
             is CustomTabListAction.RemoveCustomTabAction -> context.state.findCustomTab(action.tabId)?.let {
                 onTabsRemoved(context, listOf(it))
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)

components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/WebExtensionMiddleware.kt

@@ -34,6 +34,9 @@ internal class WebExtensionMiddleware : Middleware<BrowserState, BrowserAction>
                     activeTab?.engineState?.engineSession?.markActiveForWebExtensions(false)
                 }
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)
@@ -43,6 +46,9 @@ internal class WebExtensionMiddleware : Middleware<BrowserState, BrowserAction>
             is EngineAction.LinkEngineSessionAction -> {
                 switchActiveStateIfNeeded(context)
             }
+            else -> {
+                // no-op
+            }
         }
     }
 

components/browser/state/src/test/java/mozilla/components/browser/state/engine/middleware/TabsRemovedMiddlewareTest.kt

@@ -246,9 +246,8 @@ class TabsRemovedMiddlewareTest {
                 is TabListAction.RemoveTabAction,
                 is CustomTabListAction.RemoveAllCustomTabsAction,
                 is CustomTabListAction.RemoveCustomTabAction -> return
+                else -> next(action)
             }
-
-            next(action)
         }
     }
 }

components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/ThumbnailsMiddleware.kt

@@ -51,6 +51,9 @@ class ThumbnailsMiddleware(
             is TabListAction.RemoveTabsAction -> {
                 action.tabIds.forEach { thumbnailStorage.deleteThumbnail(it) }
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)

components/feature/containers/src/main/java/mozilla/components/feature/containers/ContainerMiddleware.kt

@@ -43,6 +43,9 @@ class ContainerMiddleware(
             is InitAction -> initializeContainers(context.store)
             is ContainerAction.AddContainerAction -> addContainer(action)
             is ContainerAction.RemoveContainerAction -> removeContainer(context.store, action)
+            else -> {
+                // no-op
+            }
         }
 
         next(action)

components/feature/downloads/src/androidTest/java/mozilla/components/feature/downloads/OnDeviceDownloadStorageTest.kt

@@ -38,6 +38,7 @@ class OnDeviceDownloadStorageTest {
     private lateinit var database: DownloadsDatabase
 
     @get:Rule
+    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
         DownloadsDatabase::class.java.canonicalName,

components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadMiddleware.kt

@@ -68,6 +68,9 @@ class DownloadMiddleware(
                     return
                 }
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)
@@ -84,6 +87,9 @@ class DownloadMiddleware(
             }
             is DownloadAction.AddDownloadAction -> sendDownloadIntent(action.download)
             is DownloadAction.RestoreDownloadStateAction -> sendDownloadIntent(action.download)
+            else -> {
+                // no-op
+            }
         }
     }
 

components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadCancelDialogFragmentTest.kt

@@ -17,11 +17,11 @@ import mozilla.components.feature.downloads.ui.DownloadCancelDialogFragment
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.spy
-import org.mockito.Mockito.verify
 import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
@@ -33,12 +33,14 @@ class DownloadCancelDialogFragmentTest {
         spy(DownloadCancelDialogFragment.newInstance(2)).apply {
             doReturn(testContext).`when`(this).requireContext()
             doReturn(mockFragmentManager()).`when`(this).parentFragmentManager
+            var wasAcceptClicked = false
+            onAcceptClicked = { _, _ -> wasAcceptClicked = true }
 
             with(onCreateDialog(null)) {
                 findViewById<Button>(R.id.accept_button).apply { performClick() }
             }
 
-            verify(this).onAcceptClicked
+            assertTrue(wasAcceptClicked)
         }
     }
 
@@ -47,12 +49,14 @@ class DownloadCancelDialogFragmentTest {
         spy(DownloadCancelDialogFragment.newInstance(2)).apply {
             doReturn(testContext).`when`(this).requireContext()
             doReturn(mockFragmentManager()).`when`(this).parentFragmentManager
+            var wasDenyCalled = false
+            onDenyClicked = { wasDenyCalled = true }
 
             with(onCreateDialog(null)) {
                 findViewById<Button>(R.id.deny_button).apply { performClick() }
             }
 
-            verify(this).onDenyClicked
+            assertTrue(wasDenyCalled)
         }
     }
 

components/feature/logins/src/androidTest/java/mozilla/components/feature/logins/LoginExceptionStorageTest.kt

@@ -37,6 +37,7 @@ class LoginExceptionStorageTest {
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
     @get:Rule
+    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
         LoginExceptionStorage::class.java.canonicalName,

components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt

@@ -438,6 +438,9 @@ class PromptFeature private constructor(
                     it.onDeny()
                 }
                 is Dismissible -> it.onDismiss()
+                else -> {
+                    // no-op
+                }
             }
         }
     }
@@ -502,6 +505,9 @@ class PromptFeature private constructor(
                 }
 
                 is Repost -> it.onConfirm()
+                else -> {
+                    // no-op
+                }
             }
         }
     }
@@ -517,6 +523,9 @@ class PromptFeature private constructor(
         store.consumePromptFrom(sessionId, promptRequestUID, activePrompt) {
             when (it) {
                 is TimeSelection -> it.onClear()
+                else -> {
+                    // no-op
+                }
             }
         }
     }

components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptMiddleware.kt

@@ -32,6 +32,9 @@ class PromptMiddleware : Middleware<BrowserState, BrowserAction> {
                     return
                 }
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)

components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/SaveLoginDialogFragment.kt

@@ -332,6 +332,9 @@ internal class SaveLoginDialogFragment : PromptDialogFragment() {
                             context?.getString(R.string.mozac_feature_prompt_update_confirmation)
                         )
                     }
+                    else -> {
+                        // no-op
+                    }
                 }
             }
             validateStateUpdate?.invokeOnCompletion {

components/feature/pwa/src/androidTest/java/mozilla/components/feature/pwa/db/ManifestDatabaseMigrationTest.kt

@@ -15,6 +15,7 @@ class ManifestDatabaseMigrationTest {
     private val TEST_DB = "migration-test"
 
     @Rule @JvmField
+    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
         ManifestDatabase::class.java.canonicalName,

components/feature/readerview/src/main/java/mozilla/components/feature/readerview/ReaderViewMiddleware.kt

@@ -121,6 +121,9 @@ class ReaderViewMiddleware : Middleware<BrowserState, BrowserAction> {
                     context.dispatch(ContentAction.UpdateUrlAction(tab.id, url))
                 }
             }
+            else -> {
+                // no-op
+            }
         }
     }
 

components/feature/recentlyclosed/src/main/java/mozilla/components/feature/recentlyclosed/RecentlyClosedMiddleware.kt

@@ -73,6 +73,9 @@ class RecentlyClosedMiddleware(
             is InitAction -> {
                 initializeRecentlyClosed(context.store)
             }
+            else -> {
+                // no-op
+            }
         }
 
         next(action)

components/feature/search/src/main/java/mozilla/components/feature/search/middleware/SearchMiddleware.kt

@@ -56,6 +56,9 @@ class SearchMiddleware(
             is SearchAction.UpdateCustomSearchEngineAction -> saveCustomSearchEngine(action)
             is SearchAction.RemoveCustomSearchEngineAction -> removeCustomSearchEngine(action)
             is SearchAction.SelectSearchEngineAction -> updateSearchEngineSelection(action)
+            else -> {
+                // no-op
+            }
         }
 
         next(action)
@@ -65,6 +68,9 @@ class SearchMiddleware(
                 updateHiddenSearchEngines(context.state.search.hiddenSearchEngines)
             is SearchAction.AddAdditionalSearchEngineAction, is SearchAction.RemoveAdditionalSearchEngineAction ->
                 updateAdditionalSearchEngines(context.state.search.additionalSearchEngines)
+            else -> {
+                // no-op
+            }
         }
     }
 

components/feature/session/src/main/java/mozilla/components/feature/session/middleware/LastAccessMiddleware.kt

@@ -67,6 +67,9 @@ class LastAccessMiddleware : Middleware<BrowserState, BrowserAction> {
                     context.dispatchUpdateActionForId(action.sessionId)
                 }
             }
+            else -> {
+                // no-op
+            }
         }
     }
 

components/feature/sitepermissions/src/androidTest/java/mozilla/components/feature/sitepermissions/db/OnDeviceSitePermissionsStorageTest.kt

@@ -34,6 +34,7 @@ class OnDeviceSitePermissionsStorageTest {
     private lateinit var database: SitePermissionsDatabase
 
     @get:Rule
+    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
         SitePermissionsDatabase::class.java.canonicalName,

components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsFeature.kt

@@ -897,6 +897,9 @@ class SitePermissionsFeature(
                     is ContentAudioCapture, is ContentAudioMicrophone -> {
                         systemPermissions.add(RECORD_AUDIO)
                     }
+                    else -> {
+                        // no-op
+                    }
                 }
             }
             return systemPermissions.all { context.isPermissionGranted((it)) }

components/feature/tab-collections/src/main/java/mozilla/components/feature/tab/collections/db/TabCollectionDao.kt

@@ -48,6 +48,7 @@ internal interface TabCollectionDao {
     )
     fun getTabCollections(): Flow<List<TabCollectionWithTabs>>
 
+    @Transaction
     @Query(
         """
         SELECT *

components/feature/tabs/src/main/java/mozilla/components/feature/tabs/WindowFeature.kt

@@ -52,6 +52,9 @@ class WindowFeature(
                             )
                             windowRequest.start()
                         }
+                        else -> {
+                            // no-op
+                        }
                     }
                 }
         }

components/feature/top-sites/src/androidTest/java/mozilla/components/feature/top/sites/OnDevicePinnedSitesStorageTest.kt

@@ -36,6 +36,7 @@ class OnDevicePinnedSitesStorageTest {
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
     @get:Rule
+    @Suppress("DEPRECATION")
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
         TopSiteDatabase::class.java.canonicalName,

components/support/locale/src/main/java/mozilla/components/support/locale/LocaleMiddleware.kt

@@ -38,6 +38,9 @@ class LocaleMiddleware(
         when (action) {
             is LocaleAction.RestoreLocaleStateAction -> restoreLocale(context.store)
             is LocaleAction.UpdateLocaleAction -> updateLocale(action.locale)
+            else -> {
+                // no-op
+            }
         }
 
         next(action)