diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index f22c20f0d..f2bb4a419 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -4,7 +4,8 @@ This page lists the versions of Compose and Kotlin that each version of Kobweb i | Kobweb | Compose | Kotlin | |-----------------|---------|--------| -| 0.20.1+ | 1.7.3 | 2.1.0 | +| 0.20.3+ | 1.7.3 | 2.1.10 | +| 0.20.1 - 0.20.2 | 1.7.3 | 2.1.0 | | 0.20.0 | 1.7.1 | 2.1.0 | | 0.19.3+ | 1.7.1 | 2.0.20 | | 0.19.1+ | 1.6.11 | 2.0.20 | diff --git a/README.md b/README.md index c0730b8ea..afbf8d486 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![version: 0.20.3](https://img.shields.io/badge/kobweb-0.20.3-blue)](COMPATIBILITY.md) [![version: 0.9.18](https://img.shields.io/badge/kobweb_cli-0.9.18-blue)](https://github.com/varabyte/kobweb-cli)
-[![kotlin: 2.1.0](https://img.shields.io/badge/kotlin-2.1.0-blue?logo=kotlin)](COMPATIBILITY.md) +[![kotlin: 2.1.10](https://img.shields.io/badge/kotlin-2.1.10-blue?logo=kotlin)](COMPATIBILITY.md) [![compose: 1.7.3](https://img.shields.io/badge/compose-1.7.3-blue?logo=jetpackcompose)](COMPATIBILITY.md) [![ktor: 3.0.3](https://img.shields.io/badge/ktor-3.0.3-blue)](https://ktor.io/)
diff --git a/frontend/compose-html-ext/src/jsMain/kotlin/com/varabyte/kobweb/compose/css/ComparableStyleScope.kt b/frontend/compose-html-ext/src/jsMain/kotlin/com/varabyte/kobweb/compose/css/ComparableStyleScope.kt index 5a64d759c..ab42a40a3 100644 --- a/frontend/compose-html-ext/src/jsMain/kotlin/com/varabyte/kobweb/compose/css/ComparableStyleScope.kt +++ b/frontend/compose-html-ext/src/jsMain/kotlin/com/varabyte/kobweb/compose/css/ComparableStyleScope.kt @@ -1,10 +1,8 @@ package com.varabyte.kobweb.compose.css -import androidx.compose.runtime.* import org.jetbrains.compose.web.css.* // We need our own implementation of StyleScope, so we can both test equality and pull values out of it later -@Immutable // TODO: Remove when CMP-5680 is fixed class ComparableStyleScope : StyleScope { val properties = mutableMapOf() val variables = mutableMapOf() diff --git a/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyle.kt b/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyle.kt index 195b23f56..ec7ab6a6d 100644 --- a/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyle.kt +++ b/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyle.kt @@ -123,7 +123,6 @@ internal value class ClassSelectors(private val value: List) { * * You can use [CssName] and [CssPrefix] annotations to customize the name of the CSS class generated for a style. */ -@Immutable // TODO: Remove when CMP-5680 is fixed abstract class CssStyle internal constructor( internal val init: CssStyleScope.() -> Unit, internal val extraModifier: @Composable () -> Modifier = { Modifier }, diff --git a/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyleVariant.kt b/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyleVariant.kt index a4270cd42..6793c9214 100644 --- a/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyleVariant.kt +++ b/frontend/silk-foundation/src/jsMain/kotlin/com/varabyte/kobweb/silk/style/CssStyleVariant.kt @@ -3,7 +3,6 @@ package com.varabyte.kobweb.silk.style import androidx.compose.runtime.* import com.varabyte.kobweb.compose.ui.Modifier -@Immutable // TODO: Remove when CMP-5680 is fixed abstract class CssStyleVariant { infix fun then(next: CssStyleVariant): CssStyleVariant { return CompositeCssStyleVariant(this, next) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 305e24214..293a600c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,12 +8,12 @@ gradle-publish = "1.3.0" janino = "3.1.12" jsoup = "1.16.2" kaml = "0.60.0" -kotlin = "2.1.0" +kotlin = "2.1.10" kotlinpoet = "1.14.2" kotlinx-coroutines = "1.8.1" kotlinx-html = "0.11.0" kotlinx-serialization = "1.7.1" -ksp = "2.1.0-1.0.29" +ksp = "2.1.10-1.0.29" ktor = "3.0.3" logback = "1.5.15" playwright = "1.45.1" diff --git a/playground/gradle/libs.versions.toml b/playground/gradle/libs.versions.toml index e3623d0b3..f05c1680e 100644 --- a/playground/gradle/libs.versions.toml +++ b/playground/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] jetbrains-compose = "1.7.3" -kotlin = "2.1.0" +kotlin = "2.1.10" kotlinx-serialization = "1.7.1" [libraries]