From 56577c9137734506adf85d462ee99e0d48fb08c1 Mon Sep 17 00:00:00 2001
From: usbharu <i@usbharu.dev>
Date: Thu, 19 Dec 2024 18:53:22 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20root=E3=81=A7=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B=E3=81=93?=
 =?UTF-8?q?=E3=81=A8=E3=81=A7=E5=85=A8=E3=81=A6=E3=81=AE=E5=AD=90=E3=81=8C?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore               |  3 +--
 hideout/build.gradle.kts | 15 +++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c27afd4..06c964b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ out/
 /tomcat/
 /tomcat-e2e/
 /e2eTest.log
-/files/
 
 *.log
 /hideout-core/files/
@@ -51,4 +50,4 @@ out/
 /http-client.private.env.json
 **/logs/
 /hideout-mastodon/logs/
-/hideout-mastodon/files/
+**/files/
diff --git a/hideout/build.gradle.kts b/hideout/build.gradle.kts
index 4bd572f4..5b6af79e 100644
--- a/hideout/build.gradle.kts
+++ b/hideout/build.gradle.kts
@@ -49,7 +49,11 @@ subprojects {
     }
 
     dependencies {
-        testImplementation(kotlin("test"))
+    }
+
+
+    kotlin {
+        jvmToolchain(21)
     }
 }
 
@@ -57,6 +61,12 @@ tasks {
     register("run") {
         dependsOn(gradle.includedBuild("hideout-core").task(":run"))
     }
+
+    getByName("test") {
+        dependsOn(subprojects.mapNotNull { it.tasks.findByName("test") })
+    }
+
+
     withType<io.gitlab.arturbosch.detekt.Detekt> {
         exclude("**/generated/**")
         exclude("build/")
@@ -70,9 +80,6 @@ tasks {
         }
     }
 
-    kotlin {
-        jvmToolchain(21)
-    }
 }
 
 dependencies {