From da137ab30210b371c32106509f539fdeb23b247a Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 5 Jul 2022 17:30:18 +0200 Subject: [PATCH] Update Kotlin and Jetpack Compose --- settings.gradle.kts | 26 +++++++++++++------------- ui/build.gradle.kts | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index c7ea27a8..9e505e13 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -41,7 +41,7 @@ dependencyResolutionManagement { version("targetSdk", "32") } create("libs") { - version("kotlin", "1.6.21") + version("kotlin", "1.7.0") version("kotlinx.coroutines", "1.6.3") alias("kotlin.stdlib") .to("org.jetbrains.kotlin", "kotlin-stdlib") @@ -60,40 +60,40 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.2.0-rc02") + version("androidx.compose.compiler", "1.2.0") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.livedata") .to("androidx.compose.runtime", "runtime-livedata") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.foundation") .to("androidx.compose.foundation", "foundation") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.foundationlayout") .to("androidx.compose.foundation", "foundation-layout") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.ui") .to("androidx.compose.ui", "ui") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.uitooling") .to("androidx.compose.ui", "ui-tooling") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.material") .to("androidx.compose.material", "material") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.materialicons") .to("androidx.compose.material", "material-icons-extended") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.animation") .to("androidx.compose.animation", "animation") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.animationgraphics") .to("androidx.compose.animation", "animation-graphics") - .versionRef("androidx.compose") + .version("1.2.0-rc03") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha13") + .version("1.0.0-alpha14") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 90fc0018..04f85233 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -39,7 +39,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = libs.versions.androidx.compose.get() + kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get() } lint {