From 6a24eb017f365610cfbca868d3d83889946ac1f3 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 11 Dec 2021 21:27:20 +0100 Subject: [PATCH] Update dependencies Kotlin to 1.6.0 and Jetpack Compose to 1.1.0-beta04 --- settings.gradle.kts | 10 +++++----- .../launcher2/ui/legacy/component/EditFavoritesRow.kt | 9 ++++++--- .../legacy/search/ApplicationDetailRepresentation.kt | 3 ++- .../ui/legacy/search/BasicGridRepresentation.kt | 4 ++-- .../ui/legacy/search/ContactDetailRepresentation.kt | 4 ++-- .../ui/legacy/search/ContactListRepresentation.kt | 4 ++-- .../ui/legacy/search/FileDetailRepresentation.kt | 5 ++--- .../ui/legacy/search/FileListRepresentation.kt | 4 ++-- .../ui/legacy/search/ShortcutDetailRepresentation.kt | 4 ++-- .../ui/legacy/search/WebsiteDetailRepresentation.kt | 3 ++- .../ui/legacy/search/WebsiteListRepresentation.kt | 3 ++- 11 files changed, 29 insertions(+), 24 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index cc1cd6f1..4bd8806b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -43,8 +43,8 @@ dependencyResolutionManagement { version("targetSdk", "31") } create("libs") { - version("kotlin", "1.5.31") - version("kotlinx.coroutines", "1.5.1") + version("kotlin", "1.6.0") + version("kotlinx.coroutines", "1.6.0-RC2") alias("kotlin.stdlib") .to("org.jetbrains.kotlin", "kotlin-stdlib") .versionRef("kotlin") @@ -62,7 +62,7 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.1.0-beta02") + version("androidx.compose", "1.1.0-beta04") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") .versionRef("androidx.compose") @@ -98,7 +98,7 @@ dependencyResolutionManagement { .versionRef("androidx.compose") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha01") + .version("1.0.0-alpha02") version("androidx.lifecycle", "2.4.0-rc01") alias("androidx.lifecycle.viewmodel") @@ -220,7 +220,7 @@ dependencyResolutionManagement { .to("androidx.datastore", "datastore") .version("1.0.0") - version("androidx.room", "2.4.0-beta02") + version("androidx.room", "2.4.0-rc01") alias("androidx.roomruntime") .to("androidx.room", "room-runtime") .versionRef("androidx.room") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesRow.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesRow.kt index baffa718..f32aabd7 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesRow.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesRow.kt @@ -10,13 +10,16 @@ import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.ktx.dp import de.mm20.launcher2.ktx.lifecycleScope import de.mm20.launcher2.ui.databinding.EditFavoritesRowBinding -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject class EditFavoritesRow @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, val favoritesItem: FavoritesItem + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + val favoritesItem: FavoritesItem ) : LinearLayout(context, attrs, defStyleAttr), KoinComponent { val iconRepository: IconRepository by inject() @@ -26,7 +29,7 @@ class EditFavoritesRow @JvmOverloads constructor( init { binding.label.text = favoritesItem.searchable?.label lifecycleScope.launch { - iconRepository.getIcon(favoritesItem.searchable!!, (48*dp).toInt()).collect{ + iconRepository.getIcon(favoritesItem.searchable!!, (48 * dp).toInt()).collectLatest { binding.icon.icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt index 2a844bb3..b7d89e71 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt @@ -52,6 +52,7 @@ import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.legacy.searchable.SearchableView import de.mm20.launcher2.ui.legacy.view.* import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.core.component.KoinComponent @@ -82,7 +83,7 @@ class ApplicationDetailRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(application) lifecycleScope.launch { - iconRepository.getIcon(application, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(application, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt index caaec6e0..29ec7feb 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt @@ -12,7 +12,7 @@ import de.mm20.launcher2.search.data.Searchable import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.legacy.searchable.SearchableView import de.mm20.launcher2.ui.legacy.view.LauncherIconView -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -54,7 +54,7 @@ class BasicGridRepresentation : Representation, KoinComponent { } icon = iconRepository.getIconIfCached(searchable) lifecycleScope.launch { - iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt index 768b68e3..92b2383a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt @@ -25,7 +25,7 @@ import de.mm20.launcher2.search.data.Searchable import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.legacy.searchable.SearchableView import de.mm20.launcher2.ui.legacy.view.* -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -52,7 +52,7 @@ class ContactDetailRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(contact) lifecycleScope.launch { - iconRepository.getIcon(contact, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(contact, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt index 73fa79ad..43ee5690 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt @@ -15,7 +15,7 @@ import de.mm20.launcher2.ui.legacy.view.FavoriteSwipeAction import de.mm20.launcher2.ui.legacy.view.HideSwipeAction import de.mm20.launcher2.ui.legacy.view.LauncherIconView import de.mm20.launcher2.ui.legacy.view.SwipeCardView -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -36,7 +36,7 @@ class ContactListRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(contact) lifecycleScope.launch { - iconRepository.getIcon(contact, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(contact, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt index bd170166..91062b6a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt @@ -6,7 +6,6 @@ import android.provider.MediaStore import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.content.FileProvider -import androidx.lifecycle.ViewModelProvider import androidx.transition.Scene import com.afollestad.materialdialogs.MaterialDialog import de.mm20.launcher2.ui.R @@ -20,7 +19,7 @@ import de.mm20.launcher2.search.data.GDriveFile import de.mm20.launcher2.search.data.Searchable import de.mm20.launcher2.ui.legacy.searchable.SearchableView import de.mm20.launcher2.ui.legacy.view.* -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.core.component.KoinComponent @@ -45,7 +44,7 @@ class FileDetailRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(file) lifecycleScope.launch { - iconRepository.getIcon(file, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(file, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt index 189385f9..dcb0cebd 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt @@ -17,7 +17,7 @@ import de.mm20.launcher2.ui.legacy.view.FavoriteSwipeAction import de.mm20.launcher2.ui.legacy.view.HideSwipeAction import de.mm20.launcher2.ui.legacy.view.LauncherIconView import de.mm20.launcher2.ui.legacy.view.SwipeCardView -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -40,7 +40,7 @@ class FileListRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(file) lifecycleScope.launch { - iconRepository.getIcon(file, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(file, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt index f31dbd3a..4cae0b1f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt @@ -17,7 +17,7 @@ import de.mm20.launcher2.ui.legacy.view.FavoriteToolbarAction import de.mm20.launcher2.ui.legacy.view.LauncherIconView import de.mm20.launcher2.ui.legacy.view.ToolbarAction import de.mm20.launcher2.ui.legacy.view.ToolbarView -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -42,7 +42,7 @@ class AppShortcutDetailRepresentation: Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(appShortcut) lifecycleScope.launch { - iconRepository.getIcon(appShortcut, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(appShortcut, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt index 70791ef8..faf9ddd2 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt @@ -23,6 +23,7 @@ import de.mm20.launcher2.ui.legacy.view.LauncherIconView import de.mm20.launcher2.ui.legacy.view.ToolbarAction import de.mm20.launcher2.ui.legacy.view.ToolbarView import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -70,7 +71,7 @@ class WebsiteDetailRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(website) lifecycleScope.launch { - iconRepository.getIcon(website, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(website, (84 * rootView.dp).toInt()).collectLatest { icon = it } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt index 737e7ca0..67cdb626 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt @@ -23,6 +23,7 @@ import de.mm20.launcher2.ui.legacy.view.LauncherIconView import de.mm20.launcher2.ui.legacy.view.ToolbarAction import de.mm20.launcher2.ui.legacy.view.ToolbarView import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -75,7 +76,7 @@ class WebsiteListRepresentation : Representation, KoinComponent { shape = LauncherIconView.getDefaultShape(context) icon = iconRepository.getIconIfCached(website) lifecycleScope.launch { - iconRepository.getIcon(website, (84 * rootView.dp).toInt()).collect { + iconRepository.getIcon(website, (84 * rootView.dp).toInt()).collectLatest { icon = it } }