use shadowJar for addon packaging

build.gradle.kts

@@ -43,6 +43,12 @@ afterEvaluate {
         configureDistribution()
     }
     forSubProjects(":common:addons") {
+        apply(plugin = "com.github.johnrengelman.shadow")
+        
+        tasks.named("build") {
+            finalizedBy(tasks.named("shadowJar"))
+        }
+        
         dependencies {
             "compileOnly"(project(":common:api"))
             "implementation"("net.jafama", "jafama", Versions.Libraries.Internal.jafama)

buildSrc/src/main/kotlin/AddonConfig.kt

@@ -21,11 +21,7 @@ fun Project.addonDir(dir: File, task: Task) {
             it.delete()
         }
         forSubProjects(":common:addons") {
-            val jar = if (tasks.findByName("shadowJar") != null) {
+            val jar = tasks.named("shadowJar").get() as ShadowJar
-                (tasks.named("shadowJar").get() as ShadowJar)
-            } else {
-                (tasks.named("jar").get() as Jar)
-            }
             
             val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
             val target = File(dir, boot + jar.archiveFileName.get())

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -146,10 +146,4 @@ fun downloadPack(packUrl: URL, project: Project) {
     file.outputStream().write(packUrl.readBytes())
 }
 
-fun Project.getJarTask(): Jar {
+fun Project.getJarTask() = tasks.named("shadowJar").get() as ShadowJar
-    return if (tasks.findByName("shadowJar") != null) {
-        (tasks.named("shadowJar").get() as ShadowJar)
-    } else {
-        (tasks.named("jar").get() as Jar)
-    }
-}

common/addons/structure-sponge-loader/build.gradle.kts

@@ -2,24 +2,16 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 version = version("0.1.0")
 
-plugins {
-    id("com.github.johnrengelman.shadow")
-}
-
 repositories {
     maven { url = uri("https://jitpack.io/") }
 }
 
 dependencies {
-    api("commons-io:commons-io:2.6")
+    api("commons-io:commons-io:2.7")
     api("com.github.Querz:NBT:6.1")
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }
 
 tasks.named<ShadowJar>("shadowJar") {
     relocate("org.apache.commons", "com.dfsek.terra.addons.sponge.lib.commons")
-}
-
-tasks.named("build") {
-    finalizedBy(tasks.named("shadowJar"))
 }

common/addons/structure-terrascript-loader/build.gradle.kts

@@ -2,20 +2,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 version = version("0.1.0")
 
-
-plugins {
-    id("com.github.johnrengelman.shadow")
-}
-
 dependencies {
-    api("commons-io:commons-io:2.6")
+    api("commons-io:commons-io:2.7")
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }
 
 tasks.named<ShadowJar>("shadowJar") {
     relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons")
-}
-
-tasks.named("build") {
-    finalizedBy(tasks.named("shadowJar"))
 }