From dee923233d68ca904c09e6a95ad5a5b9fa5a9a8c Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 6 Aug 2023 14:54:03 +0200 Subject: [PATCH] Update Kotlin and Compose --- .idea/kotlinc.xml | 2 +- .../launcher2/ui/launcher/LauncherActivity.kt | 1 + settings.gradle.kts | 26 +++++++++---------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 217e5c51..fdf8d994 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt index 5cff5c00..41f6db88 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt @@ -27,6 +27,7 @@ class LauncherActivity: SharedLauncherActivity(LauncherActivityMode.Launcher) { pausedAt = System.currentTimeMillis() } + @Deprecated("Deprecated in Java") override fun onBackPressed() { if (onBackPressedDispatcher.hasEnabledCallbacks()) { onBackPressedDispatcher.onBackPressed() diff --git a/settings.gradle.kts b/settings.gradle.kts index 1fe9dbdb..914e3d4b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,8 +9,8 @@ dependencyResolutionManagement { version("targetSdk", "34") } create("libs") { - version("kotlin", "1.8.21") - version("kotlinx.coroutines", "1.6.4") + version("kotlin", "1.9.0") + version("kotlinx.coroutines", "1.7.3") library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib") .versionRef("kotlin") library("kotlin.gradle", "org.jetbrains.kotlin", "kotlin-gradle-plugin") @@ -30,34 +30,34 @@ dependencyResolutionManagement { "kotlinx.collections.immutable" ) ) - version("kotlinx.serialization", "1.5.0") + version("kotlinx.serialization", "1.5.1") library("kotlinx.serialization.json", "org.jetbrains.kotlinx", "kotlinx-serialization-json") .versionRef("kotlinx.serialization") library("markdown", "org.jetbrains", "markdown") .version("0.4.1") - version("androidx.compose.compiler", "1.4.7") + version("androidx.compose.compiler", "1.5.1") library("androidx.compose.runtime", "androidx.compose.runtime", "runtime") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.foundation", "androidx.compose.foundation", "foundation") .version("1.6.0-alpha01") library("androidx.compose.foundationlayout", "androidx.compose.foundation", "foundation-layout") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.ui", "androidx.compose.ui", "ui") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.uitooling", "androidx.compose.ui", "ui-tooling") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.material", "androidx.compose.material", "material") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.materialicons", "androidx.compose.material", "material-icons-extended") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.animation", "androidx.compose.animation", "animation") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.animationgraphics", "androidx.compose.animation", "animation-graphics") - .version("1.6.0-alpha01") + .version("1.6.0-alpha02") library("androidx.compose.material3", "androidx.compose.material3", "material3") - .version("1.2.0-alpha03") + .version("1.2.0-alpha04") version("androidx.lifecycle", "2.6.1") library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx")