Merge branch 'release/1.6.1'

JetBrains · Mar 11, 2024 · 1f9664c · 1f9664c
2 parents 52c4bf3 + 730e368
commit 1f9664c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.coroutines.version=1.8.0
 
 #empty by default - a default version will be used
 #compose.kotlinCompilerPluginVersion=23.12.18
-compose.kotlinCompilerPluginVersion=1.5.8.1
+compose.kotlinCompilerPluginVersion=1.5.10
 
 # default|failingJs - see enum class CasesToRun
 tests.casesToRun=default

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
@@ -23,6 +23,7 @@ internal object ComposeCompilerCompatibility {
         "1.9.20" to "1.5.3",
         "1.9.21" to "1.5.4",
         "1.9.22" to "1.5.8.1",
+        "1.9.23" to "1.5.10",
         "2.0.0-Beta1" to "1.5.4-dev1-kt2.0.0-Beta1",
         "2.0.0-Beta4" to "1.5.9-kt-2.0.0-Beta4",
     )

diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
@@ -10,11 +10,11 @@ dev.junit.parallel=false
 # Default version of Compose Libraries used by Gradle plugin
 compose.version=1.6.0
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
-compose.tests.compiler.version=1.5.8.1
+compose.tests.compiler.version=1.5.10
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
-compose.tests.compiler.compatible.kotlin.version=1.9.22
+compose.tests.compiler.compatible.kotlin.version=1.9.23
 # 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.22
+compose.tests.js.compiler.compatible.kotlin.version=1.9.23
 # __SUPPORTED_GRADLE_VERSIONS__
 # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
 # minimal and current gradle version