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

The needed changes are around supporting exhaustive whens for sealed classes
as a new kotlin feature - https://kotlinlang.org/docs/whatsnew1530.html#exhaustive-when-statements-for-sealed-and-boolean-subjects

androidx_activity_compose was removed as a dependency since it isn't used.

Used 1.6.10 for Kotlin although 1.6.20 is available to prevent any issues with
Compose 1.1.1 reported as an error at compile time:
"e: This version (1.1.1) of the Compose Compiler requires Kotlin version 1.6.10
but you appear to be using Kotlin version 1.6.20 which is not known to be
compatible. Please fix your configuration (or
`suppressKotlinVersionCompatibilityCheck` but don't say I didn't warn you!)."
pull/543/head
Mugurell 2 years ago committed by mergify[bot]
parent a8a3231a50
commit a6871f9b7e

@ -57,6 +57,10 @@ class MessagingMiddleware(
is MessageDismissed -> onMessageDismissed(context, action.message)
is MessageDisplayed -> onMessagedDisplayed(action.message, context)
else -> {
// no-op
}
}
next(action)
}

@ -98,6 +98,9 @@ class HistoryMetadataMiddleware(
is EngineAction.OptimizedLoadUrlTriggeredAction -> {
directLoadTriggeredSet.add(action.tabId)
}
else -> {
// no-op
}
}
next(action)
@ -126,6 +129,9 @@ class HistoryMetadataMiddleware(
createHistoryMetadata(context, tab)
}
}
else -> {
// no-op
}
}
}

@ -197,6 +197,9 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
}
}
}
else -> {
// no-op
}
}
}

@ -154,6 +154,9 @@ class BookmarkView(
)
)
}
else -> {
// no-op
}
}
binding.bookmarksProgressBar.isVisible = state.isLoading
binding.swipeRefresh.isEnabled =

@ -108,6 +108,9 @@ class HistoryView(
context.getString(R.string.history_multi_select_title, mode.selectedItems.size)
)
}
else -> {
// no-op
}
}
}

@ -52,6 +52,9 @@ class SearchTermTabGroupMiddleware : Middleware<BrowserState, BrowserAction> {
}
}
}
else -> {
// no-op
}
}
}
}

@ -64,6 +64,7 @@ private const val EXPANDED_BY_DEFAULT = true
* @param taskContinuityEnabled Indicates whether the Task Continuity enhancements should be visible for users.
* @param onTabClick The lambda for handling clicks on synced tabs.
*/
@SuppressWarnings("LongMethod")
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun SyncedTabsList(
@ -118,6 +119,9 @@ fun SyncedTabsList(
)
}
}
else -> {
// no-op
}
}
}
} else {
@ -137,6 +141,9 @@ fun SyncedTabsList(
onTabClick(syncedTabItem.tab)
}
}
else -> {
// no-op
}
}
}
}

@ -61,6 +61,9 @@ class TelemetryMiddleware(
val tab = context.state.findTabOrCustomTab(action.tabId)
onEngineSessionKilled(context.state, tab)
}
else -> {
// no-op
}
}
next(action)
@ -81,6 +84,9 @@ class TelemetryMiddleware(
Metrics.hasOpenTabs.set(false)
}
}
else -> {
// no-op
}
}
}

@ -6,7 +6,7 @@
// FORCE REBUILD 2021-11-24
object Versions {
const val kotlin = "1.5.31"
const val kotlin = "1.6.10"
const val coroutines = "1.5.2"
// These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
@ -20,8 +20,7 @@ object Versions {
const val detekt = "1.19.0"
const val jna = "5.8.0"
const val androidx_activity_compose = "1.4.0"
const val androidx_compose = "1.0.5"
const val androidx_compose = "1.1.1"
const val androidx_appcompat = "1.3.0"
const val androidx_benchmark = "1.0.0"
const val androidx_biometric = "1.1.0"

Loading…
Cancel
Save