diff --git a/settings.gradle.kts b/settings.gradle.kts index 4441df0c..8e022cef 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -42,8 +42,8 @@ dependencyResolutionManagement { version("targetSdk", "32") } create("libs") { - version("kotlin", "1.6.10") - version("kotlinx.coroutines", "1.6.0") + version("kotlin", "1.6.21") + version("kotlinx.coroutines", "1.6.1") alias("kotlin.stdlib") .to("org.jetbrains.kotlin", "kotlin-stdlib") .versionRef("kotlin") @@ -61,7 +61,7 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.2.0-alpha07") + version("androidx.compose", "1.2.0-beta01") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") .versionRef("androidx.compose") @@ -94,7 +94,7 @@ dependencyResolutionManagement { .versionRef("androidx.compose") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha09") + .version("1.0.0-alpha10") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") @@ -122,7 +122,7 @@ dependencyResolutionManagement { ) ) - version("accompanist", "0.24.6-alpha") + version("accompanist", "0.24.7-alpha") alias("accompanist.insets") .to("com.google.accompanist", "accompanist-insets") .versionRef("accompanist") @@ -144,7 +144,7 @@ dependencyResolutionManagement { alias("androidx.core") .to("androidx.core", "core-ktx") - .version("1.8.0-alpha06") + .version("1.8.0-rc01") version("androidx.appcompat", "1.4.1") alias("androidx.appcompat") @@ -368,7 +368,7 @@ dependencyResolutionManagement { .to("com.google.protobuf", "protobuf-javalite") .versionRef("protobuf") - version("koin", "3.1.4") + version("koin", "3.1.6") alias("koin.android") .to("io.insert-koin", "koin-android") .versionRef("koin") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt index 1de56a34..6e93476d 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt @@ -12,6 +12,7 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner @@ -29,6 +30,7 @@ import de.mm20.launcher2.ui.launcher.search.common.list.SearchResultList import java.time.LocalDate import java.time.ZoneId +@OptIn(ExperimentalComposeUiApi::class) @Composable fun CalendarWidget() { val viewModel: CalendarWidgetVM = viewModel() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt index 70f6ba0a..0c4347a5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt @@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.pluralStringResource @@ -59,6 +60,7 @@ class BatteryPartProvider : PartProvider { this.time.value = time } + @OptIn(ExperimentalComposeUiApi::class) @Composable override fun Component(layout: Settings.ClockWidgetSettings.ClockWidgetLayout) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt index 73b2e561..87808fe9 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext @@ -66,7 +67,7 @@ fun CalendarWidgetSettingsScreen() { } } -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) @Composable fun ExcludedCalendarsPreference( calendars: List,