From fba12b1282b54383dcfca7a5ac5163c45326e0f3 Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Wed, 13 Mar 2019 20:15:01 -0700 Subject: [PATCH] More shading fixes --- worldedit-bukkit/build.gradle | 5 +++-- worldedit-forge/build.gradle | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle index ecff0db24..335b96c0a 100644 --- a/worldedit-bukkit/build.gradle +++ b/worldedit-bukkit/build.gradle @@ -38,9 +38,10 @@ jar { shadowJar { dependencies { + relocate "org.slf4j", "com.sk89q.worldedit.slf4j" include(dependency(':worldedit-core')) - // Must not be relocated, for StaticLoggerBinder to work: - include(dependency("org.slf4j:slf4j-jdk14:1.7.26")) + include(dependency('org.slf4j:slf4j-api')) + include(dependency("org.slf4j:slf4j-jdk14")) relocate ("org.bstats", "com.sk89q.worldedit.bukkit.bstats") { include(dependency("org.bstats:bstats-bukkit:1.4")) } diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle index 84dba2768..8fe3fb9af 100644 --- a/worldedit-forge/build.gradle +++ b/worldedit-forge/build.gradle @@ -84,8 +84,12 @@ jar { shadowJar { dependencies { + relocate "org.slf4j", "com.sk89q.worldedit.slf4j" + relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge" + include(dependency(':worldedit-core')) - include(dependency("org.apache.logging.log4j:log4j-slf4j-impl:2.11.2")) + include(dependency('org.slf4j:slf4j-api')) + include(dependency("org.apache.logging.log4j:log4j-slf4j-impl")) } }