Support kotlin 1.8.20 in compose.html lib (#3029)

Fix: take `kotlin-test-js-runner` from node_modules Move previously failing compose-compiler test cases to passing folder.
JetBrains · Apr 11, 2023 · 129c78d · 129c78d
1 parent dd5252d
commit 129c78d
Show file tree

Hide file tree

Showing 7 changed files with 276 additions and 29 deletions.
diff --git a/html/buildSrc/gradle.properties b/html/buildSrc/gradle.properties
@@ -1 +1 @@
-kotlin.version=1.8.10
+kotlin.version=1.8.20
diff --git a/html/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt b/html/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt
@@ -4,7 +4,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import java.io.File
 import java.net.URL
 
-private val CHROME_DRIVER_VERSION = "108.0.5359.71"
+private val CHROME_DRIVER_VERSION = "112.0.5615.49"
 private val GECKO_DRIVER_VERSION = "0.31.0"
 
 private fun download(url: String, file: File) {

diff --git a/...ng/CompanionGetValueOperatorComposable.kt → ...ng/CompanionGetValueOperatorComposable.kt b/...ng/CompanionGetValueOperatorComposable.kt → ...ng/CompanionGetValueOperatorComposable.kt
diff --git a/...ing/InstanceGetValueOperatorComposable.kt → ...ing/InstanceGetValueOperatorComposable.kt b/...ing/InstanceGetValueOperatorComposable.kt → ...ing/InstanceGetValueOperatorComposable.kt
diff --git a/html/gradle.properties b/html/gradle.properties
@@ -1,5 +1,5 @@
-compose.version=1.3.1
+compose.version=1.4.0-rc03
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false
-org.gradle.jvmargs=-Xmx8g
+org.gradle.jvmargs=-Xmx8g
diff --git a/html/kotlin-js-store/yarn.lock b/html/kotlin-js-store/yarn.lock
diff --git a/html/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js b/html/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js
@@ -7,9 +7,9 @@ const NewReporter = function(baseReporterDecorator, config, emitter) {
 
     const path = require('path');
     const fs = require('fs');
-    const kotlinVersion = fs.readFileSync(path.resolve(__dirname, "../../../buildSrc/build/kotlin.version"), 'utf8');
+    // const kotlinVersion = fs.readFileSync(path.resolve(__dirname, "../../../buildSrc/build/kotlin.version"), 'utf8');
 
-    const kotlinReporterModule = require(`../../../build/js/packages_imported/kotlin-test-js-runner/${kotlinVersion}/karma-kotlin-reporter`);
+    const kotlinReporterModule = require(`../../../build/js/node_modules/kotlin-test-js-runner/karma-kotlin-reporter`);
     const KotlinReporter = kotlinReporterModule['reporter:karma-kotlin-reporter'][1];
     this.$inject = KotlinReporter.$inject