diff --git a/hideout/build.gradle.kts b/hideout/build.gradle.kts index 334eb484..c9c3a262 100644 --- a/hideout/build.gradle.kts +++ b/hideout/build.gradle.kts @@ -57,8 +57,29 @@ subprojects { kotlin { jvmToolchain(21) } + } +val mergeChildResources by tasks.registering(Copy::class) { + // 各子プロジェクトの resources を処理後に取得 + dependsOn(subprojects.map { it.tasks.named("processResources") }) + + subprojects.forEach { sub -> + // 各サブプロジェクトの 'bootBuildInfo' タスクを待機するように設定 + dependsOn(sub.tasks.named("bootBuildInfo")) + + // サブプロジェクトの 'resources/main' をマージ + from(sub.layout.buildDirectory.dir("resources/main")) + } + into(layout.buildDirectory.dir("resources/main")) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + +tasks.named("processResources") { + dependsOn(mergeChildResources) +} + + tasks { register("run") { dependsOn(gradle.includedBuild("hideout-core").task(":run")) @@ -83,7 +104,7 @@ tasks { } named("bootJar") { layered { - enabled.set(false) + enabled = false } } } diff --git a/hideout/hideout-core/build.gradle.kts b/hideout/hideout-core/build.gradle.kts index 61438864..e166c34e 100644 --- a/hideout/hideout-core/build.gradle.kts +++ b/hideout/hideout-core/build.gradle.kts @@ -21,6 +21,7 @@ import com.github.jk1.license.importer.XmlReportImporter import com.github.jk1.license.render.* import kotlinx.kover.gradle.plugin.dsl.CoverageUnit import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { alias(libs.plugins.kotlin.jvm) @@ -138,8 +139,18 @@ tasks { ).toMutableList() } } + + named("bootJar") { + layered { +// enabled.set(false) + } + } + } +springBoot { + buildInfo() +} kover { diff --git a/hideout/hideout-core/src/main/resources/logback-spring.xml b/hideout/hideout-core/src/main/resources/logback-spring.xml index c935da07..c02d65d8 100644 --- a/hideout/hideout-core/src/main/resources/logback-spring.xml +++ b/hideout/hideout-core/src/main/resources/logback-spring.xml @@ -17,7 +17,7 @@ - +