Gradle cleanup/unfuckery.

Fixes #1729
EngineHub · Feb 10, 2021 · f1f8b62 · f1f8b62
1 parent e933050
commit f1f8b62
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/worldguard-bukkit/build.gradle.kts b/worldguard-bukkit/build.gradle.kts
@@ -25,6 +25,10 @@ repositories {
     }
 }
 
+configurations {
+    compileClasspath.extendsFrom(create("shade"))
+}
+
 dependencies {
     "compile"(project(":worldguard-core"))
     //"compile"(project(":worldguard-libs:bukkit"))
@@ -33,8 +37,8 @@ dependencies {
     "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
     "implementation"("com.google.guava:guava:${Versions.GUAVA}")
     "implementation"("com.sk89q:commandbook:2.3") { isTransitive = false }
-    "compileOnly"("org.bstats:bstats-bukkit:1.7")
-    "compileOnly"("co.aikar:minecraft-timings:1.0.4")
+    "shade"("org.bstats:bstats-bukkit:1.7")
+    "shade"("co.aikar:minecraft-timings:1.0.4")
 }
 
 tasks.named<Upload>("install") {
@@ -69,15 +73,17 @@ tasks.named<Jar>("jar") {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
+    configurations = listOf(project.configurations["shade"], project.configurations["runtimeClasspath"])
+
     dependencies {
         relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
-            include(dependency("org.bstats:bstats-bukkit:1.7"))
+            include(dependency("org.bstats:bstats-bukkit"))
         }
         relocate ("io.papermc.lib", "com.sk89q.worldguard.bukkit.paperlib") {
-            include(dependency("io.papermc:paperlib:1.0.4"))
+            include(dependency("io.papermc:paperlib"))
         }
         relocate ("co.aikar.timings.lib", "com.sk89q.worldguard.bukkit.timingslib") {
-            include(dependency("co.aikar:minecraft-timings:1.0.4"))
+            include(dependency("co.aikar:minecraft-timings"))
         }
     }
 }