Adopt #2

Author: ilgonmic

build.gradle.kts

@@ -2,8 +2,6 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootJar
-import java.io.FileInputStream
-import java.util.Properties
 
 val policy: String by System.getProperties()
 
@@ -63,8 +61,7 @@ setOf(
     }
 }
 
-
-val kotlinComposeWasmStdlibWasmFile: Configuration by configurations.creating {
+val kotlinComposeWasmStdlibFile: Configuration by configurations.creating {
     isTransitive = false
     isCanBeResolved = true
     isCanBeConsumed = false
@@ -106,41 +103,46 @@ dependencies {
     }
     testImplementation(libs.kotlinx.coroutines.test)
 
-    kotlinComposeWasmStdlibWasmFile(project(":cache-maker"))
+    kotlinComposeWasmStdlibFile(project(":cache-maker"))
 }
 
-fun buildPropertyFile() {
-    rootDir.resolve("src/main/resources/${propertyFile}").apply {
-        println("Generate properties into $absolutePath")
-        parentFile.mkdirs()
-        writeText(generateProperties())
+fun Project.generateProperties(
+    prefix: String = "",
+): Map<String, String> = mapOf(
+    "kotlin.version" to kotlinVersion,
+    "policy.file" to prefix + policy,
+    "indexes.file" to prefix + indexes,
+    "indexesJs.file" to prefix + indexesJs,
+    "indexesWasm.file" to prefix + indexesWasm,
+    "indexesComposeWasm.file" to prefix + indexesComposeWasm,
+    "libraries.folder.jvm" to prefix + libJVM,
+    "libraries.folder.js" to prefix + libJS,
+    "libraries.folder.wasm" to prefix + libWasm,
+    "libraries.folder.compose-wasm" to prefix + libComposeWasm,
+    "libraries.folder.compose-wasm-compiler-plugins" to prefix + libComposeWasmCompilerPlugins,
+    "libraries.folder.compiler-plugins" to prefix + compilerPluginsForJVM,
+    "spring.mvc.pathmatch.matching-strategy" to "ant_path_matcher",
+    "server.compression.enabled" to "true",
+    "server.compression.mime-types" to "application/json,text/javascript,application/wasm",
+    "skiko.version" to libs.versions.skiko.get(),
+)
+
+val propertiesGenerator by tasks.registering(PropertiesGenerator::class) {
+    dependsOn(kotlinComposeWasmStdlibFile)
+    propertiesFile.fileValue(rootDir.resolve("src/main/resources/${propertyFile}"))
+    hashableFile.set(kotlinComposeWasmStdlibFile.singleFile)
+    generateProperties().forEach { (name, value) ->
+        propertiesMap.put(name, value)
     }
 }
 
-fun generateProperties(prefix: String = "") = """
-    # this file is autogenerated by build.gradle.kts
-    kotlin.version=${kotlinVersion}
-    policy.file=${prefix + policy}
-    indexes.file=${prefix + indexes}
-    indexesJs.file=${prefix + indexesJs}
-    indexesWasm.file=${prefix + indexesWasm}
-    indexesComposeWasm.file=${prefix + indexesComposeWasm}
-    libraries.folder.jvm=${prefix + libJVM}
-    libraries.folder.js=${prefix + libJS}
-    libraries.folder.wasm=${prefix + libWasm}
-    libraries.folder.compose-wasm=${prefix + libComposeWasm}
-    libraries.folder.compose-wasm-compiler-plugins=${prefix + libComposeWasmCompilerPlugins}
-    libraries.folder.compiler-plugins=${prefix + compilerPluginsForJVM}
-    spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-    server.compression.enabled=true
-    server.compression.mime-types=application/json,text/javascript,application/wasm
-    skiko.version=${libs.versions.skiko.get()}
-""".trimIndent()
-
-val composeWasmPropertiesUpdater by tasks.registering(ComposeWasmPropertiesUpdater::class) {
-    dependsOn(kotlinComposeWasmStdlibWasmFile)
-    propertiesPath.set(rootDir.resolve("src/main/resources/${propertyFile}").absolutePath)
-    hashableFile.set(kotlinComposeWasmStdlibWasmFile.singleFile)
+val lambdaPropertiesGenerator by tasks.registering(PropertiesGenerator::class) {
+    dependsOn(kotlinComposeWasmStdlibFile)
+    propertiesFile.set(layout.buildDirectory.file("tmp/propertiesGenerator/${propertyFile}"))
+    hashableFile.set(kotlinComposeWasmStdlibFile.singleFile)
+    generateProperties(lambdaPrefix).forEach { (name, value) ->
+        propertiesMap.put(name, value)
+    }
 }
 
 tasks.withType<KotlinCompile> {
@@ -149,8 +151,7 @@ tasks.withType<KotlinCompile> {
     }
     dependsOn(":executors:jar")
     dependsOn(":indexation:run")
-    dependsOn(composeWasmPropertiesUpdater)
-    buildPropertyFile()
+    dependsOn(propertiesGenerator)
 }
 println("Using Kotlin compiler ${libs.versions.kotlin.get()}")
 
@@ -161,19 +162,12 @@ tasks.withType<BootJar> {
 
 val buildLambda by tasks.creating(Zip::class) {
     val propertyFile = propertyFile
-    val propertyFileContent = generateProperties(lambdaPrefix)
 
     from(tasks.compileKotlin)
     from(tasks.processResources) {
-        eachFile {
-            if (name == propertyFile) {
-                val properties = Properties().apply { load(FileInputStream(file)) }
-                val composeWasmHash = properties.get("dependencies.compose.wasm")
-                file.writeText(propertyFileContent)
-                file.appendText("\ndependencies.compose.wasm=$composeWasmHash")
-            }
-        }
+        exclude(propertyFile)
     }
+    from(lambdaPropertiesGenerator)
     from(policy)
     from(indexes)
     from(indexesJs)
@@ -183,16 +177,16 @@ val buildLambda by tasks.creating(Zip::class) {
     from(libWasmFolder) { into(libWasm) }
     from(libComposeWasmFolder) { into(libComposeWasm) }
     from(libJVMFolder) { into(libJVM) }
-    from(compilerPluginsForJVMFolder) {into(compilerPluginsForJVM)}
+    from(compilerPluginsForJVMFolder) { into(compilerPluginsForJVM) }
     from(libComposeWasmCompilerPluginsFolder) { into(libComposeWasmCompilerPlugins) }
-    dependsOn(kotlinComposeWasmStdlibWasmFile)
+    dependsOn(kotlinComposeWasmStdlibFile)
     into("lib") {
         from(configurations.compileClasspath) { exclude("tomcat-embed-*") }
     }
 }
 
 tasks.named<Copy>("processResources") {
-    dependsOn(composeWasmPropertiesUpdater)
+    dependsOn(propertiesGenerator)
 }
 
 tasks.withType<Test> {

buildSrc/src/main/kotlin/PropertiesUpdater.kt

@@ -1,7 +1,6 @@
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.MapProperty
-import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputFile
@@ -10,10 +9,7 @@ import java.io.File
 import java.io.FileInputStream
 import java.security.MessageDigest
 
-abstract class ComposeWasmPropertiesUpdater : DefaultTask() {
-
-    @get:Input
-    abstract val propertiesPath: Property<String>
+abstract class PropertiesGenerator : DefaultTask() {
 
     @get:InputFile
     abstract val hashableFile: RegularFileProperty
@@ -22,11 +18,11 @@ abstract class ComposeWasmPropertiesUpdater : DefaultTask() {
     abstract val propertiesMap: MapProperty<String, String>
 
     @get:OutputFile
-    val updatedPropertiesFile: RegularFileProperty = project.objects.fileProperty().fileProvider(propertiesPath.map { File(it) })
+    abstract val propertiesFile: RegularFileProperty
 
     @TaskAction
     fun updateProperties() {
-        val file = updatedPropertiesFile.get().asFile
+        val file = propertiesFile.get().asFile
 
         propertiesMap.get().let {
             if (it.isNotEmpty()) {

resource-server/build.gradle.kts

@@ -1,8 +1,7 @@
 import org.gradle.kotlin.dsl.support.serviceOf
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.FileInputStream
-import java.util.Properties
+import java.util.*
 
 plugins {
     alias(libs.plugins.spring.dependency.management)
@@ -21,7 +20,7 @@ val resourceDependency: Configuration by configurations.creating {
     isCanBeConsumed = false
 }
 
-val kotlinComposeWasmStdlibTypeInfo: Configuration by configurations.creating {
+val kotlinComposeWasmStdlibFile: Configuration by configurations.creating {
     isTransitive = false
     isCanBeResolved = true
     isCanBeConsumed = false
@@ -61,20 +60,20 @@ dependencies {
 
     resourceDependency(libs.skiko.js.wasm.runtime)
     kotlinComposeWasmStdlib(project(":cache-maker"))
-    kotlinComposeWasmStdlibTypeInfo(project(":cache-maker"))
+    kotlinComposeWasmStdlibFile(project(":cache-maker"))
 }
 
-val composeWasmPropertiesUpdater by tasks.registering(ComposeWasmPropertiesUpdater::class) {
-    dependsOn(kotlinComposeWasmStdlibTypeInfo)
+val propertiesGenerator by tasks.registering(PropertiesGenerator::class) {
+    dependsOn(kotlinComposeWasmStdlibFile)
     propertiesMap.put("spring.mvc.pathmatch.matching-strategy", "ant_path_matcher")
     propertiesMap.put("server.port", "8081")
     propertiesMap.put("skiko.version", libs.versions.skiko.get())
 
     val applicationPropertiesPath = projectDir.resolve("src/main/resources/application.properties")
 
-    propertiesPath.set(applicationPropertiesPath.normalize().absolutePath)
+    propertiesFile.fileValue(applicationPropertiesPath)
 
-    val composeWasmStdlibTypeInfo: FileCollection = kotlinComposeWasmStdlibTypeInfo
+    val composeWasmStdlibTypeInfo: FileCollection = kotlinComposeWasmStdlibFile
 
     hashableFile.fileProvider(
         provider {
@@ -84,15 +83,15 @@ val composeWasmPropertiesUpdater by tasks.registering(ComposeWasmPropertiesUpdat
 }
 
 tasks.withType<KotlinCompile> {
-    dependsOn(kotlinComposeWasmStdlibTypeInfo)
-    dependsOn(composeWasmPropertiesUpdater)
+    dependsOn(kotlinComposeWasmStdlibFile)
+    dependsOn(propertiesGenerator)
 }
 
 val skikoVersion = libs.versions.skiko
 
 tasks.named<Copy>("processResources") {
-    dependsOn(kotlinComposeWasmStdlibTypeInfo)
-    dependsOn(composeWasmPropertiesUpdater)
+    dependsOn(kotlinComposeWasmStdlibFile)
+    dependsOn(propertiesGenerator)
     val archiveOperation = project.serviceOf<ArchiveOperations>()
     from(resourceDependency.map {
         archiveOperation.zipTree(it)
@@ -101,17 +100,23 @@ tasks.named<Copy>("processResources") {
         rename("skiko\\.(.*)", "skiko-${skikoVersion.get()}.\$1")
     }
 
-    val propertiesFile = composeWasmPropertiesUpdater.flatMap { it.updatedPropertiesFile }
+    val propertiesFile = propertiesGenerator.flatMap { it.propertiesFile }
 
     from(kotlinComposeWasmStdlib) {
         into("com/compiler/server")
-        val properties = FileInputStream(propertiesFile.get().asFile).use {
-            Properties().apply {
-                load(it)
+
+        rename { original ->
+            val properties = FileInputStream(propertiesFile.get().asFile).use {
+                Properties().apply {
+                    load(it)
+                }
             }
-        }
+            val regex = Regex("stdlib_master\\.(.*)")
+            regex.find(original)?.groupValues?.get(1)?.let { extension ->
+                "stdlib-${properties["dependencies.compose.wasm"]}.$extension"
+            } ?: original
 
-        rename("stdlib_master\\.(.*)", "stdlib-${properties["dependencies.compose.wasm"]}.\$1")
+        }
     }
 }