From 98385c6b823a405d37f4bb8986797611d4bd9771 Mon Sep 17 00:00:00 2001
From: usbharu <i@usbharu.dev>
Date: Tue, 13 May 2025 14:54:40 +0900
Subject: [PATCH] Revert "wip"

This reverts commit e28b8f0d6c7ca1bffcce28ee3de2e70cd54ca74a.
---
 hideout/build.gradle.kts                      | 23 +------------------
 hideout/hideout-core/build.gradle.kts         | 11 ---------
 .../src/main/resources/logback-spring.xml     |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/hideout/build.gradle.kts b/hideout/build.gradle.kts
index c9c3a262..334eb484 100644
--- a/hideout/build.gradle.kts
+++ b/hideout/build.gradle.kts
@@ -57,29 +57,8 @@ 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>("processResources") {
-    dependsOn(mergeChildResources)
-}
-
-
 tasks {
     register("run") {
         dependsOn(gradle.includedBuild("hideout-core").task(":run"))
@@ -104,7 +83,7 @@ tasks {
     }
     named<BootJar>("bootJar") {
         layered {
-            enabled = false
+            enabled.set(false)
         }
     }
 }
diff --git a/hideout/hideout-core/build.gradle.kts b/hideout/hideout-core/build.gradle.kts
index e166c34e..61438864 100644
--- a/hideout/hideout-core/build.gradle.kts
+++ b/hideout/hideout-core/build.gradle.kts
@@ -21,7 +21,6 @@ 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)
@@ -139,18 +138,8 @@ tasks {
             ).toMutableList()
         }
     }
-
-    named<BootJar>("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 c02d65d8..c935da07 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 @@
 
 <configuration>
     <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/console-appender.xml"/>
     <include resource="org/springframework/boot/logging/logback/file-appender.xml"/>