From 12c1c4f12a828c8752b33936da2bb13a8a405680 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Wed, 31 May 2023 23:46:57 +0200
Subject: [PATCH] tidy fatJar task

---
 app/build.gradle.kts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a628ef8..8c24b9e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -50,16 +50,17 @@ tasks {
         }
     }
 
-    val fatJar = register<Jar>("fatJar") {
-        group = "build"
+    val fatJar by registering(Jar::class) {
+        group = LifecycleBasePlugin.BUILD_GROUP
         dependsOn.addAll(listOf("compileJava", "compileKotlin", "processResources"))
         archiveClassifier.set("all")
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         manifest { attributes(mapOf("Main-Class" to application.mainClass)) }
-        val sourcesMain = sourceSets.main.get()
-        val contents = configurations.runtimeClasspath.get()
-            .map { if (it.isDirectory) it else zipTree(it) } + sourcesMain.output
-        from(contents)
+        from(sourceSets.main.get().output)
+        dependsOn(configurations.runtimeClasspath)
+        from(configurations.runtimeClasspath.map { classpath ->
+            classpath.incoming.artifacts.artifactFiles.files.filter { it.name.endsWith("jar") }.map { zipTree(it) }
+        })
     }
 
     build {