From 5d355e4906cd09a8336ed1cc15b449ff99557ba3 Mon Sep 17 00:00:00 2001 From: Pavel Shishkin Date: Tue, 7 May 2024 17:44:44 +0200 Subject: [PATCH] update compose compiler version to 1.5.13 (#4770) --- .../integrations/composable-test-cases/gradle.properties | 6 +++--- .../org/jetbrains/compose/ComposeCompilerCompatibility.kt | 3 ++- gradle-plugins/gradle.properties | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties index 919ee0d68e..38bd4718d9 100644 --- a/compose/integrations/composable-test-cases/gradle.properties +++ b/compose/integrations/composable-test-cases/gradle.properties @@ -1,11 +1,11 @@ org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m kotlin.code.style=official android.useAndroidX=true -kotlin.version=1.9.23 +kotlin.version=1.9.24 agp.version=7.3.0 # a version of compose libraries. In this project the only dependency is compose-runtime. -compose.version=1.6.1 +compose.version=1.6.10-rc01 # a group id for compose-runtime. Keep it as a parameter to easily change it on CI. compose.runtime.groupId=org.jetbrains.compose.runtime @@ -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.10.2 +compose.kotlinCompilerPluginVersion=1.5.13.1 # 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 index 5855fe671d..93e0df7462 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 @@ -23,7 +23,8 @@ 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", + "1.9.23" to "1.5.13", + "1.9.24" to "1.5.13.1", "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", "2.0.0-Beta5" to "1.5.11-kt-2.0.0-Beta5", diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index a8214f8831..c57751c1f3 100644 --- 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.10-dev1590 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI. -compose.tests.compiler.version=1.5.10.2 +compose.tests.compiler.version=1.5.13.1 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. -compose.tests.compiler.compatible.kotlin.version=1.9.23 +compose.tests.compiler.compatible.kotlin.version=1.9.24 # 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.23 +compose.tests.js.compiler.compatible.kotlin.version=1.9.24 # __SUPPORTED_GRADLE_VERSIONS__ # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well # and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config