build(gradle): Move jpackageImage into buildSrc

Author: ktgw0316

buildSrc/src/main/java/lightzone.remove-unused.gradle.kts

@@ -0,0 +1,33 @@
+plugins {
+	java
+}
+
+afterEvaluate {
+    tasks {
+        named<Task>("jpackageImage") {
+            dependsOn("build")
+
+            doLast {
+                val jarsToDelete = listOf(
+                    "annotations*.jar",
+                    "antlr4-runtime*.jar",
+                    "bigint*.jar",
+                    "checker-qual*.jar",
+                    "commons-compiler*.jar",
+                    "error_prone_annotations*.jar",
+                    "failureaccess*.jar",
+                    "guava*.jar",
+                    "j2objc-annotations*.jar",
+                    "janino*.jar",
+                    "jsr305*.jar",
+                    "jts-core*.jar",
+                    "kotlin-stdlib*.jar",
+                    "listenablefuture*.jar"
+                )
+                jarsToDelete.forEach { jar ->
+                    delete(fileTree(layout.buildDirectory.dir("jpackage/lightzone/lib/app")).matching { include(jar) })
+                }
+            }
+        }
+    }
+}

linux/build.gradle.kts

@@ -4,6 +4,7 @@ import java.time.format.DateTimeFormatter
 plugins {
     kotlin("jvm")
     id("lightzone.java-conventions")
+    id("lightzone.remove-unused")
     id("org.beryx.runtime")
 }
 dependencies {
@@ -21,10 +22,7 @@ tasks {
     }
     jpackage {
         dependsOn("jpackageImage")
-    }
-    jpackageImage {
-        dependsOn("build")
-        doLast {
+        doFirst {
             copy {
                 from("products/")
                 include("dcraw_lz")
@@ -45,26 +43,6 @@ tasks {
                 include("**")
                 into(layout.buildDirectory.dir("jpackage/lightzone/share/icons"))
             }
-
-            val jarsToDelete = listOf(
-                "annotations*.jar",
-                "antlr4-runtime*.jar",
-                "bigint*.jar",
-                "checker-qual*.jar",
-                "commons-compiler*.jar",
-                "error_prone_annotations*.jar",
-                "failureaccess*.jar",
-                "guava*.jar",
-                "j2objc-annotations*.jar",
-                "janino*.jar",
-                "jsr305*.jar",
-                "jts-core*.jar",
-                "kotlin-stdlib*.jar",
-                "listenablefuture*.jar"
-            )
-            jarsToDelete.forEach { jar ->
-                delete(fileTree(layout.buildDirectory.dir("jpackage/lightzone/lib/app")).matching { include(jar) })
-            }
         }
     }
 }

macosx/build.gradle.kts

@@ -4,6 +4,7 @@ import java.time.format.DateTimeFormatter
 plugins {
     kotlin("jvm")
     id("lightzone.java-conventions")
+    id("lightzone.remove-unused")
     id("org.beryx.runtime")
 }
 dependencies {
@@ -23,7 +24,7 @@ tasks {
         commandLine("make", "-C", "help")
     }
     jpackage {
-        dependsOn("build", "helpFiles")
+        dependsOn("jpackageImage", "helpFiles")
         doFirst {
             copy {
                 from("products/")
@@ -39,26 +40,6 @@ tasks {
                 include("*.icns")
                 into(layout.buildDirectory.dir("jpackage/LightZone.app/Contents/Resources"))
             }
-
-            val jarsToDelete = listOf(
-                "annotations*.jar",
-                "antlr4-runtime*.jar",
-                "bigint*.jar",
-                "checker-qual*.jar",
-                "commons-compiler*.jar",
-                "error_prone_annotations*.jar",
-                "failureaccess*.jar",
-                "guava*.jar",
-                "j2objc-annotations*.jar",
-                "janino*.jar",
-                "jsr305*.jar",
-                "jts-core*.jar",
-                "kotlin-stdlib*.jar",
-                "listenablefuture*.jar"
-            )
-            jarsToDelete.forEach { jar ->
-                delete(fileTree(layout.buildDirectory.dir("jpackage/lightzone/lib/app")).matching { include(jar) })
-            }
         }
         doLast {
             val versionSuffix = "-${project.version.toString().substringBefore("b")}.dmg"

windows/build.gradle.kts

@@ -4,6 +4,7 @@ import java.time.format.DateTimeFormatter
 plugins {
     kotlin("jvm")
     id("lightzone.java-conventions")
+    id("lightzone.remove-unused")
     id("org.beryx.runtime")
 }
 dependencies {
@@ -24,7 +25,7 @@ tasks {
         commandLine("make", "-C", "help")
     }
     jpackage {
-        dependsOn("build", "helpFiles")
+        dependsOn("jpackageImage", "helpFiles")
         doFirst {
             copy {
                 from("products/")
@@ -38,26 +39,6 @@ tasks {
                 include("*.dll")
                 into(layout.buildDirectory.dir("jpackage/LightZone/app"))
             }
-
-            val jarsToDelete = listOf(
-                "annotations*.jar",
-                "antlr4-runtime*.jar",
-                "bigint*.jar",
-                "checker-qual*.jar",
-                "commons-compiler*.jar",
-                "error_prone_annotations*.jar",
-                "failureaccess*.jar",
-                "guava*.jar",
-                "j2objc-annotations*.jar",
-                "janino*.jar",
-                "jsr305*.jar",
-                "jts-core*.jar",
-                "kotlin-stdlib*.jar",
-                "listenablefuture*.jar"
-            )
-            jarsToDelete.forEach { jar ->
-                delete(fileTree(layout.buildDirectory.dir("jpackage/lightzone/lib/app")).matching { include(jar) })
-            }
         }
         doLast {
             val versionSuffix = "-${project.version}.msi"