Fix after version upgrade

Author: ilgonmic

build.gradle.kts

@@ -33,6 +33,7 @@ allprojects {
         maven("https://repo.spring.io/snapshot")
         maven("https://repo.spring.io/milestone")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide")
+        maven("https://packages.jetbrains.team/maven/p/kt/dev/")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
         maven("https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies")
@@ -186,13 +187,15 @@ val buildLambda by tasks.creating(Zip::class) {
     from(libJVMFolder) { into(libJVM) }
     from(compilerPluginsForJVMFolder) {into(compilerPluginsForJVM)}
     from(libComposeWasmCompilerPluginsFolder) { into(libComposeWasmCompilerPlugins) }
+    dependsOn(kotlinComposeWasmStdlibTypeInfo)
     from(kotlinComposeWasmStdlibTypeInfo) { into(cachesComposeWasm) }
     into("lib") {
         from(configurations.compileClasspath) { exclude("tomcat-embed-*") }
     }
 }
 
 tasks.named<Copy>("processResources") {
+    dependsOn(kotlinComposeWasmStdlibTypeInfo)
     dependsOn(composeWasmPropertiesUpdater)
 }
 

cache-maker/build.gradle.kts

@@ -8,6 +8,7 @@ kotlin {
         binaries.executable().forEach {
             it.linkTask.configure {
                 compilerOptions.freeCompilerArgs.add("-Xir-dce=false")
+                compilerOptions.freeCompilerArgs.add("-Xwasm-multimodule-mode=master")
             }
         }
     }
@@ -25,7 +26,7 @@ kotlin {
 val composeWasmStdlib: Provider<Directory> = layout.buildDirectory
     .dir("compose-wasm-stdlib-output")
 val composeWasmStdlibTypeInfo: Provider<RegularFile> = composeWasmStdlib
-    .map { it.file("stdlib.typeinfo.bin") }
+    .map { it.file("stdlib_master.wasm") }
 
 val buildComposeWasmStdlibModule by tasks.registering(Exec::class) {
 
@@ -70,7 +71,7 @@ kotlinComposeWasmStdlibTypeInfo.outgoing.variants.create("stdlib") {
     }
 
     artifact(composeWasmStdlib) {
-        builtBy(prepareTypeInfoIntoComposeWasmCache)
+        builtBy(buildComposeWasmStdlibModule)
     }
 }
 
@@ -82,7 +83,7 @@ kotlinComposeWasmStdlibTypeInfo.outgoing.variants.create("typeinfo") {
         )
     }
 
-    artifact(cachesComposeWasmFolder.file("stdlib.typeinfo.bin")) {
+    artifact(composeWasmStdlibTypeInfo) {
         builtBy(prepareTypeInfoIntoComposeWasmCache)
     }
 }

common/src/main/kotlin/com/compiler/server/common/components/CliUtils.kt

@@ -51,9 +51,7 @@ fun compileWasmArgs(
     "-ir-output-name=$moduleName",
   ).also {
       if (icDir != null) {
-          typeInfoArg(icDir, log)?.let { stdlibTypeInfoArg ->
-              it.add(stdlibTypeInfoArg)
-          }
+          it.add("-Xwasm-multimodule-mode=slave")
       }
   } + compilerPluginsArgs
 
@@ -67,7 +65,6 @@ fun linkWasmArgs(
     icDir: Path?,
     outputDir: Path,
     debugInfo: Boolean,
-    log: (String) -> Unit,
 ): List<String> {
   return mutableListOf(
     "-Xreport-all-warnings",
@@ -82,37 +79,11 @@ fun linkWasmArgs(
     if (debugInfo) it.add("-Xwasm-generate-wat")
 
     if (icDir != null) {
-        typeInfoArg(icDir, log)?.let { stdlibTypeInfoArg ->
-            it.add(stdlibTypeInfoArg)
-        }
+        it.add("-Xwasm-multimodule-mode=slave")
     } else {
       it.add("-Xir-dce")
     }
   }
 }
 
-private fun typeInfoArg(
-    icDir: Path,
-    log: (String) -> Unit,
-): String? {
-    val allTypeInfoFiles = icDir.toFile().listFiles() ?: run {
-        log("No typeinfo files in $icDir, probably you need to run :cache-maker:prepareTypeInfoIntoComposeWasmCache task")
-        return null
-    }
-
-    val stdlibTypeInfo = allTypeInfoFiles
-        .firstOrNull { file -> file.name.endsWith(".typeinfo.bin") }
-
-    if (stdlibTypeInfo == null) {
-        log("No typeinfo files in $icDir, probably you need to run :cache-maker:prepareTypeInfoIntoComposeWasmCache task")
-        return null
-    }
-
-    if (allTypeInfoFiles.size > 1) {
-        log("There are more than 1 typeinfo files in $icDir: ${allTypeInfoFiles.joinToString(", ") { it.name }}")
-    }
-
-    return "-Xwasm-typeinfo-file=${stdlibTypeInfo.normalize().absolutePath}"
-}
-
 val PATH_SEPARATOR: String = File.pathSeparator

common/src/main/kotlin/com/compiler/server/common/components/KotlinEnvironment.kt

@@ -87,6 +87,8 @@ class KotlinEnvironment(
     return f(environment)
   }
 
+  val disposable = Disposer.newDisposable()
+
   private val configuration = createConfiguration()
   val jsConfiguration: CompilerConfiguration = configuration.copy().apply {
     put(CommonConfigurationKeys.MODULE_NAME, "playground")
@@ -111,12 +113,13 @@ class KotlinEnvironment(
       COMPOSE_WASM_COMPILER_PLUGINS,
       composeWasmCompilerPluginOptions,
       emptyList(),
-      this
+      this,
+      disposable
     )
   }
 
   private val environment = KotlinCoreEnvironment.createForProduction(
-    projectDisposable = Disposer.newDisposable(),
+    projectDisposable = disposable,
     configuration = configuration.copy(),
     configFiles = EnvironmentConfigFiles.JVM_CONFIG_FILES
   )

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-kotlin = "2.2.0-dev-1011"
-kotlinWasmStdlibCompiler = "2.2.0-dev-1010"
+kotlin = "2.2.0-dev-8507"
+kotlinWasmStdlibCompiler = "2.2.0-dev-8507"
 kotlinIdeVersion = "1.9.20-506"
 kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
 spring-boot = "2.7.10"

indexation/src/main/kotlin/WebIndexationBuilder.kt

@@ -29,7 +29,8 @@ class WebIndexationBuilder(
           compilerPlugins,
           compilerPluginOptions,
           emptyList(),
-          configuration
+          configuration,
+          kotlinEnvironment.disposable
         )
       }
       val sourceModule = prepareAnalyzedSourceModule(

resource-server/build.gradle.kts

@@ -84,10 +84,12 @@ val composeWasmPropertiesUpdater by tasks.registering(ComposeWasmPropertiesUpdat
 }
 
 tasks.withType<KotlinCompile> {
+    dependsOn(kotlinComposeWasmStdlibTypeInfo)
     dependsOn(composeWasmPropertiesUpdater)
 }
 
 tasks.named<Copy>("processResources") {
+    dependsOn(kotlinComposeWasmStdlibTypeInfo)
     dependsOn(composeWasmPropertiesUpdater)
     val archiveOperation = project.serviceOf<ArchiveOperations>()
     from(resourceDependency.map {

resource-server/src/main/kotlin/com/compiler/server/controllers/ResourceRestController.kt

@@ -40,15 +40,15 @@ class ResourceRestController(
     if (hash != dependenciesComposeWasm) {
       throw IllegalArgumentException("Unexpected stdlib")
     }
-    return cacheableResource("/com/compiler/server/stdlib.uninstantiated.mjs", MediaType("text", "javascript"))
+    return cacheableResource("/com/compiler/server/stdlib_master.uninstantiated.mjs", MediaType("text", "javascript"))
   }
 
   @GetMapping("/stdlib-{hash}.wasm")
   fun getStdlibWasm(@PathVariable hash: String): ResponseEntity<Resource> {
     if (hash != dependenciesComposeWasm) {
       throw IllegalArgumentException("Unexpected stdlib")
     }
-    return cacheableResource("/com/compiler/server/stdlib.wasm", MediaType("application", "wasm"))
+    return cacheableResource("/com/compiler/server/stdlib_master.wasm", MediaType("application", "wasm"))
   }
 
   private fun cacheableResource(path: String, mediaType: MediaType): ResponseEntity<Resource> {

settings.gradle.kts

@@ -7,6 +7,8 @@ pluginManagement {
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
 
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+
+        maven("https://packages.jetbrains.team/maven/p/kt/dev/")
     }
 }
 plugins {

src/main/kotlin/com/compiler/server/compiler/components/KotlinToJSTranslator.kt

@@ -188,7 +188,6 @@ class KotlinToJSTranslator(
                   icDir,
                   outputDir,
                   debugInfo,
-                  log::warn,
                 )
               )
             }