From b9bec46eead6d400a5b3973aef242d9d1d1f5da0 Mon Sep 17 00:00:00 2001 From: Mugurell Date: Mon, 28 Feb 2022 20:04:08 +0200 Subject: [PATCH] [fenix] Revert "For https://github.com/mozilla-mobile/fenix/issues/23871 - Update compose to 1.1.0 and kotlin to 1.6.10" This reverts commit 30cb395b04e583ea9457a987f19f047a33de2213. --- .../fenix/historymetadata/HistoryMetadataMiddleware.kt | 6 ------ .../org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt | 3 --- .../org/mozilla/fenix/library/bookmarks/BookmarkView.kt | 3 --- .../java/org/mozilla/fenix/library/history/HistoryView.kt | 3 --- .../mozilla/fenix/tabstray/SearchTermTabGroupMiddleware.kt | 3 --- .../java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt | 3 --- .../org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt | 6 ------ .../java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt | 6 ------ buildSrc/src/main/java/Dependencies.kt | 5 +++-- 9 files changed, 3 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt index f4d5007012..39d0ccdfab 100644 --- a/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt @@ -98,9 +98,6 @@ class HistoryMetadataMiddleware( is EngineAction.OptimizedLoadUrlTriggeredAction -> { directLoadTriggeredSet.add(action.tabId) } - else -> { - // no-op - } } next(action) @@ -129,9 +126,6 @@ class HistoryMetadataMiddleware( createHistoryMetadata(context, tab) } } - else -> { - // no-op - } } } 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 dea8c95f4d..c4a09deba1 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 @@ -191,9 +191,6 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan } } } - else -> { - // no-op - } } } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt index 399b47a965..dcbf80948e 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt @@ -149,9 +149,6 @@ class BookmarkView( ) ) } - else -> { - // no-op - } } binding.bookmarksProgressBar.isVisible = state.isLoading binding.swipeRefresh.isEnabled = diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt index e2f9ef161f..28e0bd76e0 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt @@ -91,9 +91,6 @@ class HistoryView( context.getString(R.string.history_multi_select_title, mode.selectedItems.size) ) } - else -> { - // no-op - } } } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/SearchTermTabGroupMiddleware.kt b/app/src/main/java/org/mozilla/fenix/tabstray/SearchTermTabGroupMiddleware.kt index c5f28e755d..10fb6a9c58 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/SearchTermTabGroupMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/SearchTermTabGroupMiddleware.kt @@ -52,9 +52,6 @@ class SearchTermTabGroupMiddleware : Middleware { } } } - else -> { - // no-op - } } } } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt index 7c3008b751..de2a3fa9a7 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt @@ -54,9 +54,6 @@ class TabsTrayMiddleware( } } } - else -> { - // no-op - } } } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt index 9a4461bc6f..28e2bd876d 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt @@ -119,9 +119,6 @@ fun SyncedTabsList( ) } } - else -> { - // no-op - } } } } else { @@ -141,9 +138,6 @@ fun SyncedTabsList( onTabClick(syncedTabItem.tab) } } - else -> { - // no-op - } } } } diff --git a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt index a1889eeb08..369b47a6f3 100644 --- a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt @@ -60,9 +60,6 @@ class TelemetryMiddleware( val tab = context.state.findTabOrCustomTab(action.tabId) onEngineSessionKilled(context.state, tab) } - else -> { - // no-op - } } next(action) @@ -83,9 +80,6 @@ class TelemetryMiddleware( metrics.track(Event.HaveNoOpenTabs) } } - else -> { - // no-op - } } } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 54da5b7d20..167207cdde 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -6,7 +6,7 @@ // FORCE REBUILD 2021-11-24 object Versions { - const val kotlin = "1.6.10" + const val kotlin = "1.5.31" const val coroutines = "1.5.2" // These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to: @@ -20,7 +20,8 @@ object Versions { const val detekt = "1.17.1" const val jna = "5.6.0" - const val androidx_compose = "1.1.0" + const val androidx_activity_compose = "1.4.0" + const val androidx_compose = "1.0.5" const val androidx_appcompat = "1.3.0" const val androidx_benchmark = "1.0.0" const val androidx_biometric = "1.1.0"