diff --git a/benchmarks/multiplatform/gradle/libs.versions.toml b/benchmarks/multiplatform/gradle/libs.versions.toml index e7fab7bab1d..9dd5eacc937 100644 --- a/benchmarks/multiplatform/gradle/libs.versions.toml +++ b/benchmarks/multiplatform/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -compose-multiplatform = "1.8.1" -kotlin = "2.2.0" +compose-multiplatform = "1.9.1" +kotlin = "2.3.0-Beta2" kotlinx-coroutines = "1.8.0" kotlinx-serialization = "1.8.0" kotlinx-io = "0.7.0" diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index b4076219d11..a53ff66e186 100644 --- a/ci/templates/desktop-template/gradle.properties +++ b/ci/templates/desktop-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=2.2.20 -compose.version=1.9.0 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index b4076219d11..a53ff66e186 100644 --- a/ci/templates/html-library-template/gradle.properties +++ b/ci/templates/html-library-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=2.2.20 -compose.version=1.9.0 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/ci/templates/maven-test-project/pom.xml b/ci/templates/maven-test-project/pom.xml index 41985b10f04..c9e3be04927 100644 --- a/ci/templates/maven-test-project/pom.xml +++ b/ci/templates/maven-test-project/pom.xml @@ -13,8 +13,8 @@ official 11 2.1.21 - 1.9.1 - 1.9.0-beta04 + 1.10.0-alpha02 + 1.10.0-alpha02 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 8345e57d0fc..09887066170 100644 --- a/ci/templates/multiplatform-template/gradle.properties +++ b/ci/templates/multiplatform-template/gradle.properties @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.0 +compose.version=1.10.0-alpha02 diff --git a/components/gradle.properties b/components/gradle.properties index ea952daa28e..912f06c12b1 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -7,9 +7,9 @@ org.gradle.configuration-cache=true android.useAndroidX=true #Versions -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.0 +compose.version=1.10.0-SNAPSHOT+ok-check-kotlin-2-3-0 deploy.version=9999.0.0-SNAPSHOT #Compose diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index 9825b2dab06..a9793c7dac7 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.1 +compose.version=1.10.0-alpha02 diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 9825b2dab06..a9793c7dac7 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.1 +compose.version=1.10.0-alpha02 diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties index 9825b2dab06..a9793c7dac7 100644 --- a/examples/graphics-2d/gradle.properties +++ b/examples/graphics-2d/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.1 +compose.version=1.10.0-alpha02 diff --git a/examples/html/compose-bird/gradle.properties b/examples/html/compose-bird/gradle.properties index cddf54f730e..09878a965a5 100644 --- a/examples/html/compose-bird/gradle.properties +++ b/examples/html/compose-bird/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index 292a22f32b8..512eba46807 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -1,6 +1,6 @@ kotlin.code.style=official kotlin.js.webpack.major.version=4 -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index cddf54f730e..09878a965a5 100644 --- a/examples/html/landing/gradle.properties +++ b/examples/html/landing/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index cddf54f730e..09878a965a5 100644 --- a/examples/html/with-react/gradle.properties +++ b/examples/html/with-react/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 61c48c61788..78a00c7cf73 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -7,6 +7,6 @@ org.gradle.configuration-cache=true org.gradle.caching=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.1 +compose.version=1.10.0-alpha02 diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties index 922b9f8e4b6..356564f0bb1 100644 --- a/examples/interop/ios-compose-in-swiftui/gradle.properties +++ b/examples/interop/ios-compose-in-swiftui/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties index c90e9dd52f2..8698a4a8ea1 100644 --- a/examples/interop/ios-compose-in-uikit/gradle.properties +++ b/examples/interop/ios-compose-in-uikit/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties index c90e9dd52f2..8698a4a8ea1 100644 --- a/examples/interop/ios-swiftui-in-compose/gradle.properties +++ b/examples/interop/ios-swiftui-in-compose/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties index c90e9dd52f2..8698a4a8ea1 100644 --- a/examples/interop/ios-uikit-in-compose/gradle.properties +++ b/examples/interop/ios-uikit-in-compose/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 4b7bf7085fc..308deec73c0 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -19,6 +19,6 @@ kotlin.code.style=official android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 agp.version=8.9.0 -compose.version=1.9.1 +compose.version=1.10.0-alpha02 diff --git a/examples/jetsnack/gradle.properties b/examples/jetsnack/gradle.properties index f4169fc81d4..69e49d604ab 100644 --- a/examples/jetsnack/gradle.properties +++ b/examples/jetsnack/gradle.properties @@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx8g kotlin.code.style=official android.useAndroidX=true agp.version=8.9.0 -kotlin.version=2.2.20 -compose.version=1.9.1 +kotlin.version=2.3.0-Beta2 +compose.version=1.10.0-alpha02 diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt index 0851f99c3f6..d2d6eb569ad 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt @@ -87,7 +87,7 @@ class GradlePluginTest : GradlePluginTestBase() { } // Note: we can't test non-jvm targets with Kotlin older than 2.2.0, because of klib abi version bump in 2.2.0 - private val oldestSupportedKotlinVersion = "2.2.0" + private val oldestSupportedKotlinVersion = "2.3.0-Beta2" @Test fun testOldestKotlinMpp() = with( testProject( diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 2509f0e7919..4ff78fcf14e 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -9,9 +9,9 @@ dev.junit.parallel=false # Default version of Compose Libraries used by Gradle plugin compose.version=1.10.0-alpha02 -compose.material3.version=1.9.0-beta03 +compose.material3.version=1.10.0-alpha02 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI. -compose.tests.kotlin.version=2.2.20 +compose.tests.kotlin.version=2.3.0-Beta2 # __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 diff --git a/gradle-plugins/gradle/libs.versions.toml b/gradle-plugins/gradle/libs.versions.toml index 8e7cbc074a7..80bb3b7a106 100644 --- a/gradle-plugins/gradle/libs.versions.toml +++ b/gradle-plugins/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.2.0" gradle-download-plugin = "5.5.0" -kotlin-poet = "2.1.0" +kotlin-poet = "2.2.0" plugin-android = "8.10.1" shadow-jar = "8.1.1" publish-plugin = "1.2.1" diff --git a/html/buildSrc/gradle.properties b/html/buildSrc/gradle.properties index 3a0de6635ed..d7eac606d79 100644 --- a/html/buildSrc/gradle.properties +++ b/html/buildSrc/gradle.properties @@ -1 +1 @@ -kotlin.version=2.2.20 +kotlin.version=2.3.0-Beta2 diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md index 5114d87a0ca..7a1cb82061f 100644 --- a/tutorials/HTML/Getting_Started/README.md +++ b/tutorials/HTML/Getting_Started/README.md @@ -36,8 +36,8 @@ pluginManagement { ``` kotlin // Add compose gradle plugin plugins { - kotlin("multiplatform") version "2.2.20" - id("org.jetbrains.compose") version "1.9.0" + kotlin("multiplatform") version "2.3.0-Beta2" + id("org.jetbrains.compose") version "1.10.0-alpha02" } // Add maven repositories