From 457861b87984dc8fc922b97e3b4351b069b99d40 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Fri, 9 Jul 2021 11:08:17 +0200 Subject: [PATCH] Update Upstream 1f21162 Ensure the SLF4J ban is being applied --- buildSrc/src/main/kotlin/CommonConfig.kt | 8 -------- buildSrc/src/main/kotlin/PlatformConfig.kt | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 618e9fc71..48f996a50 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -42,14 +42,6 @@ fun Project.applyCommonConfiguration() { } } - configurations.findByName("compileClasspath")?.apply { - resolutionStrategy.componentSelection { - withModule("org.slf4j:slf4j-api") { - reject("No SLF4J allowed on compile classpath") - } - } - } - plugins.withId("java") { the().toolchain { languageVersion.set(JavaLanguageVersion.of(16)) diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index 591edbd62..6ecbf6657 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -108,6 +108,16 @@ fun Project.applyPlatformAndCoreConfiguration() { } } + if (name != "worldedit-fabric") { + configurations["compileClasspath"].apply { + resolutionStrategy.componentSelection { + withModule("org.slf4j:slf4j-api") { + reject("No SLF4J allowed on compile classpath") + } + } + } + } + // tasks.named("check").configure { // dependsOn("checkstyleMain", "checkstyleTest") // }