fix: shading with newer shadow plugin

BanManagement · Jan 5, 2025 · 0ac361a · 0ac361a
1 parent 7214f56
commit 0ac361a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -116,12 +116,12 @@ tasks.named<ShadowJar>("shadowJar") {
     dependencies {
         include(dependency(":BanManagerCommon"))
         include(dependency(":BanManagerLibs"))
-        relocate("org.bstats", "me.confuser.banmanager.common.bstats") {
-            include(dependency("org.bstats:"))
-        }
-        relocate("org.slf4j", "me.confuser.banmanager.common.slf4j") {
-            include(dependency("org.slf4j:"))
-        }
+
+        include(dependency("org.bstats:.*:.*"))
+        include(dependency("org.slf4j:.*:.*"))
+
+        relocate("org.bstats", "me.confuser.banmanager.common.bstats")
+        relocate("org.slf4j", "me.confuser.banmanager.common.slf4j")
     }
 
     exclude("GradleStart**")
@@ -132,8 +132,12 @@ tasks.named<ShadowJar>("shadowJar") {
     exclude("org/intellij/**")
     exclude("org/jetbrains/**")
     exclude("bungeecord.yml")
+    exclude("velocity.yml")
 
-    minimize()
+    minimize {
+        exclude(dependency("org.bstats:.*:.*"))
+        exclude(dependency("org.slf4j:.*:.*"))
+    }
 }
 
 tasks.named("assemble").configure {

diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts
@@ -94,9 +94,9 @@ tasks.named<ShadowJar>("shadowJar") {
     dependencies {
         include(dependency(":BanManagerCommon"))
         include(dependency(":BanManagerLibs"))
-        relocate("org.bstats", "me.confuser.banmanager.common.bstats") {
-            include(dependency("org.bstats:"))
-        }
+        include(dependency("org.bstats:.*:.*"))
+
+        relocate("org.bstats", "me.confuser.banmanager.common.bstats")
     }
     exclude("GradleStart**")
     exclude(".cache");
@@ -105,8 +105,11 @@ tasks.named<ShadowJar>("shadowJar") {
     exclude("META-INF/maven/**")
     exclude("org/intellij/**")
     exclude("org/jetbrains/**")
+    exclude("velocity.yml")
 
-    minimize()
+    minimize {
+        exclude(dependency("org.bstats:.*:.*"))
+    }
 }
 
 tasks.named("assemble").configure {

diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts
@@ -152,9 +152,9 @@ tasks.named<ShadowJar>("shadowJar") {
     dependencies {
         include(dependency(":BanManagerCommon"))
         include(dependency(":BanManagerLibs"))
-        relocate("org.bstats", "me.confuser.banmanager.common.bstats") {
-            include(dependency("org.bstats:"))
-        }
+        include(dependency("org.bstats:.*:.*"))
+
+        relocate("org.bstats", "me.confuser.banmanager.common.bstats")
     }
 
     exclude("GradleStart**")
@@ -168,8 +168,11 @@ tasks.named<ShadowJar>("shadowJar") {
     exclude("**/module-info.class")
     exclude("*.yml")
     exclude("assets/banmanager/bungeecord.yml")
+    exclude("assets/banmanager/velocity.yml")
 
-    minimize()
+    minimize {
+        exclude(dependency("org.bstats:.*:.*"))
+    }
 }
 
 tasks.named("assemble").configure {