Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Kotlin 2.1.10 #651

Merged
merged 1 commit into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion COMPATIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
<br>
[![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/)
<br>
Expand Down
Original file line number Diff line number Diff line change
@@ -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<String, String>()
val variables = mutableMapOf<String, String>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ internal value class ClassSelectors(private val value: List<String>) {
*
* 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<K : CssKind> internal constructor(
internal val init: CssStyleScope.() -> Unit,
internal val extraModifier: @Composable () -> Modifier = { Modifier },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<K : ComponentKind> {
infix fun then(next: CssStyleVariant<K>): CssStyleVariant<K> {
return CompositeCssStyleVariant(this, next)
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion playground/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
jetbrains-compose = "1.7.3"
kotlin = "2.1.0"
kotlin = "2.1.10"
kotlinx-serialization = "1.7.1"

[libraries]
Expand Down