From b3dee0db79fc21231d828a28e6238c365b14cd0b Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Wed, 27 Dec 2023 18:29:53 +0300 Subject: [PATCH] Add kotlin 1.9.22 support (#4075) --- .../org/jetbrains/compose/ComposeCompilerCompatibility.kt | 1 + gradle-plugins/gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt index e5763c44e7..29c077aa39 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt @@ -22,6 +22,7 @@ internal object ComposeCompilerCompatibility { "1.9.20-RC2" to "1.5.3-rc01", "1.9.20" to "1.5.3", "1.9.21" to "1.5.4", + "1.9.22" to "1.5.7", "2.0.0-Beta1" to "1.5.4-dev1-kt2.0.0-Beta1", ) diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index aa953f63cd..cc7a2ae4fb 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -4,11 +4,11 @@ kotlin.code.style=official # Default version of Compose Libraries used by Gradle plugin compose.version=1.6.0-dev1340 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. -compose.tests.compiler.version=1.5.4 +compose.tests.compiler.version=1.5.7 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. -compose.tests.compiler.compatible.kotlin.version=1.9.21 +compose.tests.compiler.compatible.kotlin.version=1.9.22 # The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI. -compose.tests.js.compiler.compatible.kotlin.version=1.9.21 +compose.tests.js.compiler.compatible.kotlin.version=1.9.22 # __SUPPORTED_GRADLE_VERSIONS__ # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well compose.tests.gradle.versions=7.4, 8.3