Merge branch 'master' into feature/dynamic-plugin-yml

Iridium-Development · Jul 21, 2024 · 4874636 · 4874636
2 parents 3a37368 + 70520af
commit 4874636
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,10 +64,9 @@ bukkit {
 }
 
 tasks {
-    // "Replace" the build task with the shadowJar task (probably bad but who cares)
-    jar {
-        dependsOn("shadowJar")
-        enabled = false
+    // Add the shadowJar task to the build task
+    build {
+        dependsOn(shadowJar)
     }
 
     shadowJar {
@@ -80,8 +79,11 @@ tasks {
         // Relocate dependencies
         relocate("com.iridium.iridiumcore")
         relocate("com.j256.ormlite")
-        relocate("org.bstats")
         relocate("de.jeff_media.updatechecker")
+        relocate("org.bstats")
+        relocate("org.intellij.lang.annotations")
+        relocate("org.jetbrains.annotations")
+        relocate("org.jnbt")
 
         // Remove unnecessary files from the jar
         minimize()