From 8bfb69baee5ea54372f3d0e5f20ef10d091a9562 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Mon, 22 Nov 2021 14:04:45 -0500 Subject: [PATCH] Update dependencies so that logging *actually* works this time Signed-off-by: solonovamax --- platforms/bukkit/build.gradle.kts | 7 ++++++- platforms/fabric/build.gradle.kts | 8 ++++++-- platforms/sponge/build.gradle.kts | 8 ++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 0ea623c11..e4a5f56b0 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -17,7 +17,12 @@ val purpurURL = "https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/artifact/fin dependencies { shadedApi(project(":common:implementation:base")) - shadedImplementation("org.slf4j:slf4j-log4j12:1.7.32") + shadedApi("org.slf4j:slf4j-api:1.8.0-beta4") { + because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") + } + shadedImplementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1") { + because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") + } compileOnly("io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT") shadedImplementation("io.papermc:paperlib:1.0.5") diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index a7f3bbacf..d07c2246a 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -24,8 +24,12 @@ val fabricLoader = "0.12.5" dependencies { shadedApi(project(":common:implementation:base")) - shadedImplementation("org.slf4j:slf4j-log4j12:1.7.32") -// shadedImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") + shadedApi("org.slf4j:slf4j-api:1.8.0-beta4") { + because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") + } + shadedImplementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1") { + because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") + } minecraft("com.mojang:minecraft:$minecraft") mappings("net.fabricmc:yarn:$minecraft+build.$yarn:v2") diff --git a/platforms/sponge/build.gradle.kts b/platforms/sponge/build.gradle.kts index 066960a66..4e0d0a6b1 100644 --- a/platforms/sponge/build.gradle.kts +++ b/platforms/sponge/build.gradle.kts @@ -11,8 +11,12 @@ repositories { dependencies { shadedApi(project(":common:implementation:base")) - shadedImplementation("org.slf4j:slf4j-log4j12:1.7.32") -// "shadedImplementation"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") + shadedApi("org.slf4j:slf4j-api:1.8.0-beta4") { + because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") + } + shadedImplementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1") { + because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") + } annotationProcessor("org.spongepowered:spongeapi:9.0.0-SNAPSHOT") shadedImplementation("org.spongepowered:spongeapi:9.0.0-SNAPSHOT")