Browse Source

Fix HTML tests after Kotlin 2.2 migration (#5410)

[Migration to Provider API for Kotlin/Wasm and Kotlin/JS
properties](https://kotlinlang.org/docs/whatsnew2120.html#migration-to-provider-api-for-kotlin-wasm-and-kotlin-js-properties)

## Release Notes
N/A
pull/5411/head
Ivan Matkov 4 months ago committed by GitHub
parent
commit
b4b1ce8c0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      html/compose-compiler-integration/build.gradle.kts
  2. 2
      html/compose-compiler-integration/main-template/build.gradle.kts
  3. 2
      html/compose-compiler-integration/main-template/lib/build.gradle.kts

4
html/compose-compiler-integration/build.gradle.kts

@ -60,12 +60,14 @@ fun build( @@ -60,12 +60,14 @@ fun build(
failureExpected: Boolean = false,
composeVersion: String,
kotlinVersion: String,
vararg buildCmd: String = arrayOf("build", "jsNodeRun")
vararg buildCmd: String = arrayOf("build", "jsNodeDevelopmentRun")
) {
val isWin = System.getProperty("os.name").startsWith("Win")
val arguments = buildCmd.toMutableList().also {
it.add("-Pcompose.version=$composeVersion")
it.add("-Pkotlin.version=$kotlinVersion")
it.add("--stacktrace")
it.add("--info")
}.toTypedArray()
val procBuilder = if (isWin) {

2
html/compose-compiler-integration/main-template/build.gradle.kts

@ -31,4 +31,4 @@ kotlin { @@ -31,4 +31,4 @@ kotlin {
}
tasks.findByName("jsBrowserProductionWebpack")!!.mustRunAfter("jsDevelopmentExecutableCompileSync")
tasks.findByName("jsNodeRun")!!.mustRunAfter("jsProductionExecutableCompileSync")
tasks.findByName("jsNodeDevelopmentRun")!!.mustRunAfter("jsProductionExecutableCompileSync")

2
html/compose-compiler-integration/main-template/lib/build.gradle.kts

@ -31,4 +31,4 @@ kotlin { @@ -31,4 +31,4 @@ kotlin {
tasks.findByName("jsBrowserProductionWebpack")!!.mustRunAfter("jsDevelopmentExecutableCompileSync")
tasks.findByName("jsNodeRun")!!.mustRunAfter("jsProductionExecutableCompileSync")
tasks.findByName("jsNodeDevelopmentRun")!!.mustRunAfter("jsProductionExecutableCompileSync")
Loading…
Cancel
Save