Skip to content

Commit e9e2027

Browse files
ilgonmicdkrasnoff
authored andcommitted
Microfix #3
1 parent 4d62cde commit e9e2027

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
44
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
55
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
66
import org.springframework.boot.gradle.tasks.bundling.BootJar
7+
import java.io.FileInputStream
8+
import java.util.Properties
79

810
val policy: String by System.getProperties()
911

@@ -141,7 +143,10 @@ val buildLambda by tasks.creating(Zip::class) {
141143
from(tasks.processResources) {
142144
eachFile {
143145
if (name == propertyFile) {
146+
val properties = Properties().apply { load(FileInputStream(file)) }
147+
val composeWasmHash = properties.get("dependencies.compose.wasm")
144148
file.writeText(propertyFileContent)
149+
file.appendText("\ndependencies.compose.wasm=$composeWasmHash")
145150
}
146151
}
147152
}

resource-server/build.gradle.kts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import org.gradle.kotlin.dsl.support.serviceOf
22
import org.gradle.kotlin.dsl.withType
33
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
import java.nio.file.Files
5+
import kotlin.io.path.createFile
46

57
plugins {
68
alias(libs.plugins.spring.dependency.management)
@@ -68,9 +70,13 @@ val composeWasmPropertiesUpdater by tasks.registering(ComposeWasmPropertiesUpdat
6870
propertiesMap.put("server.port", "8081")
6971
propertiesMap.put("skiko.version", libs.versions.skiko.get())
7072

71-
val applicationPropertiesFile = projectDir.resolve("src/main/resources/application.properties")
72-
val applicationProperties = applicationPropertiesFile.absolutePath
73-
propertiesPath.set(applicationProperties)
73+
val applicationPropertiesPath = projectDir.resolve("src/main/resources/application.properties")
74+
75+
if (!applicationPropertiesPath.exists()) {
76+
applicationPropertiesPath.createNewFile()
77+
}
78+
79+
propertiesPath.set(applicationPropertiesPath.normalize().absolutePath)
7480

7581
val composeWasmStdlibTypeInfo: FileCollection = kotlinComposeWasmStdlibTypeInfo
7682

@@ -79,10 +85,6 @@ val composeWasmPropertiesUpdater by tasks.registering(ComposeWasmPropertiesUpdat
7985
composeWasmStdlibTypeInfo.singleFile
8086
}
8187
)
82-
83-
if (!applicationPropertiesFile.exists()) {
84-
applicationPropertiesFile.createNewFile()
85-
}
8688
}
8789

8890
tasks.withType<KotlinCompile> {

0 commit comments

Comments
 (0)