Skip to content

Commit 18f5588

Browse files
committed
Merge branch 'resolve-errors-such-as-unresolved-reference-jvm-by-downgrading-to-kotlin-2.2.10' into dev
2 parents b903cb1 + a171ac2 commit 18f5588

File tree

9 files changed

+3172
-239
lines changed

9 files changed

+3172
-239
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ apiValidation {
1313
}
1414

1515
ignoredProjects += "compose-multiplatform-html-unified".let {
16-
listOf("$it-demo", "$it-common-legacy")
16+
listOf("$it-demo")
1717
}
1818
}

buildSrc/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ repositories {
1010
}
1111

1212
dependencies {
13-
val kotlinVersion = "2.2.20"
13+
val kotlinVersion = "2.2.10"
1414
implementation(kotlin("gradle-plugin", kotlinVersion))
1515
implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
1616
implementation("org.jetbrains.compose:compose-gradle-plugin:1.9.0")
17-
implementation("com.huanshankeji.team:gradle-plugins:0.10.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch
17+
implementation("com.huanshankeji.team:gradle-plugins:0.10.0-SNAPSHOT") { exclude("org.jetbrains.kotlin") } // TODO don't use a snapshot version in a main branch
1818
implementation("com.android.tools.build:gradle:8.12.3")
19-
implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20250918-SNAPSHOT") // TODO don't use a snapshot version in a main branch
19+
implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20250918-SNAPSHOT") { exclude("org.jetbrains.kotlin") } // TODO don't use a snapshot version in a main branch
2020
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
val androidSdkVersion = 35
1+
val androidSdkVersion = 36

common/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ kotlin {
5454
dependencies {
5555
api(compose.html.core)
5656
// see: https://github.com/varabyte/kobweb/blob/main/frontend/kobweb-compose/build.gradle.kts
57-
api("com.varabyte.kobweb:kobweb-compose:${DependencyVersions.kobweb}")
58-
implementation("com.huanshankeji:compose-html-common:${DependencyVersions.huanshankejiComposeHtml}")
57+
api("com.varabyte.kobweb:kobweb-compose:${DependencyVersions.kobweb}") { exclude("org.jetbrains.kotlin") }
58+
implementation("com.huanshankeji:compose-html-common:${DependencyVersions.huanshankejiComposeHtml}") {
59+
exclude("org.jetbrains.kotlin")
60+
}
5961

6062
/*
6163
The UI module depends on the lifecycle module to use `androidx.lifecycle.ViewModelStoreOwner`.

kotlin-js-store/wasm/yarn.lock

Lines changed: 2987 additions & 0 deletions
Large diffs are not rendered by default.

kotlin-js-store/yarn.lock

Lines changed: 171 additions & 228 deletions
Large diffs are not rendered by default.

material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.composeUi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import com.huanshankeji.compose.ui.PlatformModifier
1515

1616
@Composable
1717
actual fun RadioRow(selected: Boolean, label: String, onClick: () -> Unit, modifier: Modifier, enabled: Boolean) =
18-
Row(Modifier.platformModifier.selectable(selected, enabled, Role.RadioButton, onClick)) {
18+
Row(Modifier.platformModifier.selectable(selected, enabled, Role.RadioButton, null, onClick)) {
1919
RadioButton(selected, null)
2020
Text(label)
2121
}

material3/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ kotlin {
3535
}
3636
jsMain {
3737
dependencies {
38-
api("com.huanshankeji:compose-html-material3:${DependencyVersions.huanshankejiComposeHtml}")
39-
implementation("com.huanshankeji:compose-html-common:${DependencyVersions.huanshankejiComposeHtml}")
38+
api("com.huanshankeji:compose-html-material3:${DependencyVersions.huanshankejiComposeHtml}") { exclude("org.jetbrains.kotlin") }
39+
implementation("com.huanshankeji:compose-html-common:${DependencyVersions.huanshankejiComposeHtml}") {
40+
exclude("org.jetbrains.kotlin")
41+
}
4042
}
4143
}
4244
}

settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
rootProject.name = "compose-multiplatform-html-unified"
22

33
include("common") // TODO consider splitting into several modules including `foundation`, `ui`, etc. (#45)
4-
include("common:legacy")
54
include("material-icons-core")
65
include("material2")
76
include("material3")

0 commit comments

Comments
 (0)