Update Kotlin and Compose

This commit is contained in:
MM20 2023-08-06 14:54:03 +02:00
parent 24997b8dcc
commit dee923233d
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 15 additions and 14 deletions

2
.idea/kotlinc.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="KotlinJpsPluginSettings"> <component name="KotlinJpsPluginSettings">
<option name="version" value="1.8.21" /> <option name="version" value="1.9.0" />
</component> </component>
</project> </project>

View File

@ -27,6 +27,7 @@ class LauncherActivity: SharedLauncherActivity(LauncherActivityMode.Launcher) {
pausedAt = System.currentTimeMillis() pausedAt = System.currentTimeMillis()
} }
@Deprecated("Deprecated in Java")
override fun onBackPressed() { override fun onBackPressed() {
if (onBackPressedDispatcher.hasEnabledCallbacks()) { if (onBackPressedDispatcher.hasEnabledCallbacks()) {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()

View File

@ -9,8 +9,8 @@ dependencyResolutionManagement {
version("targetSdk", "34") version("targetSdk", "34")
} }
create("libs") { create("libs") {
version("kotlin", "1.8.21") version("kotlin", "1.9.0")
version("kotlinx.coroutines", "1.6.4") version("kotlinx.coroutines", "1.7.3")
library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib") library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib")
.versionRef("kotlin") .versionRef("kotlin")
library("kotlin.gradle", "org.jetbrains.kotlin", "kotlin-gradle-plugin") library("kotlin.gradle", "org.jetbrains.kotlin", "kotlin-gradle-plugin")
@ -30,34 +30,34 @@ dependencyResolutionManagement {
"kotlinx.collections.immutable" "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") library("kotlinx.serialization.json", "org.jetbrains.kotlinx", "kotlinx-serialization-json")
.versionRef("kotlinx.serialization") .versionRef("kotlinx.serialization")
library("markdown", "org.jetbrains", "markdown") library("markdown", "org.jetbrains", "markdown")
.version("0.4.1") .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") 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") library("androidx.compose.foundation", "androidx.compose.foundation", "foundation")
.version("1.6.0-alpha01") .version("1.6.0-alpha01")
library("androidx.compose.foundationlayout", "androidx.compose.foundation", "foundation-layout") 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") 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") 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") 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") 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") 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") 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") library("androidx.compose.material3", "androidx.compose.material3", "material3")
.version("1.2.0-alpha03") .version("1.2.0-alpha04")
version("androidx.lifecycle", "2.6.1") version("androidx.lifecycle", "2.6.1")
library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx") library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx")