Skip to content

Commit 7f012cb

Browse files
authored
Allow having k/js target without setting org.jetbrains.compose.experimental.jscanvas.enabled=true (#5340)
Fixes https://youtrack.jetbrains.com/issue/CMP-8425 ## Testing Updated the relevant test ## Release Notes ### Highlights - Web - Setting `org.jetbrains.compose.experimental.jscanvas.enabled=true` is not required anymore when having a kotlin/js target
1 parent 76681da commit 7f012cb

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ private val TargetType.gradlePropertyName get() = "org.jetbrains.compose.experim
2727

2828
private val EXPERIMENTAL_TARGETS: Set<TargetType> = setOf(
2929
TargetType("macos", identifiers = listOf("macosX64", "macosArm64")),
30-
TargetType("jscanvas", identifiers = listOf("jsIr", "js")),
3130
)
3231

3332
private sealed interface CheckResult {

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,6 @@ class GradlePluginTest : GradlePluginTestBase() {
3535
defaultTestEnvironment.copy(useGradleConfigurationCache = false)
3636
)
3737
) {
38-
fun jsCanvasEnabled(value: Boolean) {
39-
modifyGradleProperties { put("org.jetbrains.compose.experimental.jscanvas.enabled", value.toString()) }
40-
41-
}
42-
43-
jsCanvasEnabled(false)
44-
gradleFailure(":build").checks {
45-
check.logContains("ERROR: Compose targets '[jscanvas]' are experimental and may have bugs!")
46-
}
47-
48-
jsCanvasEnabled(true)
4938
gradle(":build").checks {
5039
check.taskSuccessful(":unpackSkikoWasmRuntime")
5140
check.taskSuccessful(":processSkikoRuntimeForKWasm")

0 commit comments

Comments
 (0)