Refactor: build

Author: KHiyowa

integration/build.gradle

@@ -21,7 +21,9 @@ compileTestKotlin {
     compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
 }
 
-configurations { buildSudachiDict }
+configurations {
+    buildSudachiDict
+}
 
 dependencies {
     buildSudachiDict (project(':spi'))
@@ -71,7 +73,6 @@ esTestEnv {
     bundlePath = packageDir
     systemDic = compileSystemDictionary.get().outputs.files.singleFile.toPath()
     configFile = rootProject.rootDir.toPath().resolve("src/test/resources/com/worksap/nlp/lucene/sudachi/ja/sudachi.json")
-    additionalJars.add(project(":testlib").getTasksByName('jar', false).first().outputs.files.singleFile.toPath())
     addPlugin("analysis-icu", downloadIcuPlugin)
     addPlugin('sudachi-sub', project(':subplugin').getTasksByName('distZip', false).first())
 }
@@ -95,11 +96,17 @@ test {
 def distZip = tasks.register('distZip', Zip) {
     var esKind = sudachiEs.kind.get()
     archiveBaseName.set("${esKind.engine.kind}-${esKind.version}-$archivesBaseName")
-    from(
-        project(':subplugin').packageJars.outputs.files,
-        project(':subplugin').embedVersion.outputs.files,
-        project(':testlib').jar.outputs.files,
-    )
+
+    // This task creates the test plugin ZIP used by the CI shell scripts.
+    // We rebuild it from source components to ensure correctness and avoid build order issues.
+    dependsOn(project(':subplugin').tasks.named('jar'), project(':testlib').tasks.named('jar'))
+
+    from(project(':subplugin').tasks.named('jar'))
+    from(project(':testlib').tasks.named('jar'))
+    from(project(':subplugin').file('src/main/extras/plugin-descriptor.properties')) {
+        into('/') // Ensure descriptor is at the root of the zip
+        expand(version: project(':subplugin').version, engineVersion: esKind.version, engineKind: esKind.engine.kind)
+    }
 }
 
 artifacts {

subplugin/build.gradle

@@ -8,8 +8,17 @@ plugins {
 group = 'com.worksap.nlp'
 version = properties["pluginVersion"]
 
+configurations {
+    // A dedicated configuration to pull in just the testlib jar, not its transitive dependencies
+    testlibJar {
+        setTransitive(false)
+    }
+}
+
 dependencies {
-    compileOnly(project(':spi'))
+    compileOnly project(':spi')
+    compileOnly project(':testlib')
+    testlibJar project(':testlib')
 }
 
 def embedVersion = tasks.register('embedVersion', Copy) {
@@ -26,11 +35,12 @@ def embedVersion = tasks.register('embedVersion', Copy) {
 }
 
 def packageJars = tasks.register('packageJars', Copy) {
-    from configurations.runtimeClasspath
-    from tasks.jar.outputs
+    // Package only this project's jar and the testlib jar.
+    // Other dependencies are provided by the main plugin at runtime.
+    from tasks.jar
+    from configurations.testlibJar
     var esKind = sudachiEs.kind.get()
     into "build/package/${version}/${esKind.engine.kind}-${esKind.version}"
-    dependsOn tasks.jar
 }
 
 def distZip = tasks.register('distZip', Zip) {