From d23b0e61285733b208b687cfe1740526a0775162 Mon Sep 17 00:00:00 2001
From: "ryosuke.a.tanaka" <ryosuke.a.tanaka@dena.com>
Date: Tue, 3 Mar 2026 13:54:53 +0900
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20spotlessTarget=E3=81=A7=E4=B8=8D?=
 =?UTF-8?q?=E8=A6=81=E3=81=AA=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88?=
 =?UTF-8?q?=E3=83=AA=E3=82=92=E4=B8=80=E6=8B=AC=E9=99=A4=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3413dda1..b3bc1ff6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,10 +113,17 @@ test {
   useJUnitPlatform()
 }
 
+def spotlessTarget = { String pattern ->
+  fileTree('.') {
+    include pattern
+    // dena/ は対象に含めたい
+    exclude 'bin/**', 'build/**', '.gradle/**', 'src/main/java/core/org/**', 'denaN/**', 'denaL/**'
+  }
+}
+
 spotless {
   java {
-    target '**/*.java'
-    targetExclude 'src/main/java/core/org/**/*.java'
+    target spotlessTarget('**/*.java')
 
     cleanthat()
     googleJavaFormat()
@@ -127,7 +134,7 @@ spotless {
   }
 
   kotlin {
-    target '**/*.kt'
+    target spotlessTarget('**/*.kt')
 
     ktfmt().googleStyle()
     trimTrailingWhitespace()
@@ -135,7 +142,7 @@ spotless {
   }
 
   groovy {
-    target '**/*.gradle'
+    target spotlessTarget('**/*.gradle')
 
     greclipse()
     leadingTabsToSpaces(2)
@@ -144,7 +151,7 @@ spotless {
   }
 
   flexmark {
-    target '**/*.md'
+    target spotlessTarget('**/*.md')
 
     flexmark()
   }

From 5892b9d8bd5454b04c762b79eb5025d3f30bb142 Mon Sep 17 00:00:00 2001
From: "ryosuke.a.tanaka" <ryosuke.a.tanaka@dena.com>
Date: Tue, 3 Mar 2026 14:04:51 +0900
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=85=B1=E9=80=9A=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E3=82=92=E9=96=A2=E6=95=B0=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 83 +++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 50 deletions(-)

diff --git a/build.gradle b/build.gradle
index b3bc1ff6..18f2fce7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,15 +85,8 @@ dependencies {
 
   izpack 'org.codehaus.izpack:izpack-dist:5.1.3'
 
-  // load additional dena modules if it exists
-  ['dena/', 'denaN/', 'denaL/'].each { def dir ->
-    def libs = file(dir + 'libraries.gradle')
-    if (libs.exists()) {
-      Eval.me(libs.text).each { def lib ->
-        implementation lib
-      }
-    }
-  }
+  // load additional Internal modules if it exists
+  eachInternalEntry('libraries.gradle') { dir, lib -> implementation lib }
 }
 
 licenseReport {
@@ -113,6 +106,33 @@ test {
   useJUnitPlatform()
 }
 
+/**
+ * 内部ディレクトリ配下に存在する filename の内容を Eval.me で評価し、
+ * 各エントリと元ディレクトリを action(dir, entry) の形で渡す汎用イテレータ
+ */
+def eachInternalEntry(String filename, Closure action) {
+  ['dena/', 'denaN/', 'denaL/'].each { def dir ->
+    def f = file(dir + filename)
+    if (f.exists()) {
+      Eval.me(f.text).each { action(dir, it) }
+    }
+  }
+}
+
+/**
+ * 内部ディレクトリ配下に存在する filename の内容を Eval.me で評価し、
+ * 実在するソースディレクトリパスの一覧を返す
+ */
+def collectInternalSrcDirs(String filename) {
+  def result = []
+  eachInternalEntry(filename) { dir, src ->
+    if (file(dir + src).exists()) {
+      result << dir + src
+    }
+  }
+  return result
+}
+
 def spotlessTarget = { String pattern ->
   fileTree('.') {
     include pattern
@@ -229,55 +249,18 @@ eclipse {
 sourceSets {
   main {
     java {
-      def list = ['src/main/java/core']
-
-      // load additional dena sources if it exists
-      ['dena/', 'denaN/', 'denaL/'].each { def dir ->
-        def srcs = file(dir + 'sources.gradle')
-        if (srcs.exists()) {
-          Eval.me(srcs.text).each { def src ->
-            if (file(dir + src).exists()) {
-              list << dir + src
-            }
-          }
-        }
-      }
-      srcDirs = list
+      srcDirs = ['src/main/java/core'] + collectInternalSrcDirs('sources.gradle')
     }
     resources {
-      def list = ['src/main/resources']
-      // load additional dena resources if it exists
-      ['dena/', 'denaN/', 'denaL/'].each { def dir ->
-        def srcs = file(dir + 'resources.gradle')
-        if (srcs.exists()) {
-          Eval.me(srcs.text).each { def src ->
-            if (file(dir + src).exists()) {
-              list << dir + src
-            }
-          }
-        }
-      }
-      srcDirs = list
+      srcDirs = ['src/main/resources'] + collectInternalSrcDirs('resources.gradle')
     }
   }
   test {
     java {
-      def list = [
+      srcDirs = [
         'src/test/java',
         'src/test/kotlin'
-      ]
-      // load additional dena tests if it exists
-      ['dena/', 'denaN/', 'denaL/'].each { def dir ->
-        def srcs = file(dir + 'tests.gradle')
-        if (srcs.exists()) {
-          Eval.me(srcs.text).each { def src ->
-            if (file(dir + src).exists()) {
-              list << dir + src
-            }
-          }
-        }
-      }
-      srcDirs = list
+      ] + collectInternalSrcDirs('tests.gradle')
     }
   }
 }