mirror of https://github.com/usbharu/Hideout.git
parent
83cff53fac
commit
98385c6b82
|
@ -57,29 +57,8 @@ subprojects {
|
||||||
kotlin {
|
kotlin {
|
||||||
jvmToolchain(21)
|
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>("processResources") {
|
|
||||||
dependsOn(mergeChildResources)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
register("run") {
|
register("run") {
|
||||||
dependsOn(gradle.includedBuild("hideout-core").task(":run"))
|
dependsOn(gradle.includedBuild("hideout-core").task(":run"))
|
||||||
|
@ -104,7 +83,7 @@ tasks {
|
||||||
}
|
}
|
||||||
named<BootJar>("bootJar") {
|
named<BootJar>("bootJar") {
|
||||||
layered {
|
layered {
|
||||||
enabled = false
|
enabled.set(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,6 @@ import com.github.jk1.license.importer.XmlReportImporter
|
||||||
import com.github.jk1.license.render.*
|
import com.github.jk1.license.render.*
|
||||||
import kotlinx.kover.gradle.plugin.dsl.CoverageUnit
|
import kotlinx.kover.gradle.plugin.dsl.CoverageUnit
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
import org.springframework.boot.gradle.tasks.bundling.BootJar
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
alias(libs.plugins.kotlin.jvm)
|
alias(libs.plugins.kotlin.jvm)
|
||||||
|
@ -139,18 +138,8 @@ tasks {
|
||||||
).toMutableList()
|
).toMutableList()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
named<BootJar>("bootJar") {
|
|
||||||
layered {
|
|
||||||
// enabled.set(false)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
springBoot {
|
|
||||||
buildInfo()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
kover {
|
kover {
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<property name="LOG_FILE" value="logs/logFile.log"/>
|
<property name="LOG_FILE" value="logs/logFile.log"/>
|
||||||
<property name="CONSOLE_LOG_THRESHOLD" value="${CONSOLE_LOG_THRESHOLD:-TRACE}"/>
|
<property name="CONSOLE_LOG_THRESHOLD" value="${CONSOLE_LOG_THRESHOLD:-INFO}"/>
|
||||||
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
|
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
|
||||||
<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
|
<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
|
||||||
<include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
|
<include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
|
||||||
|
|
Loading…
Reference in New Issue