diff --git a/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts b/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts index 781e429cdc..576b9d832e 100644 --- a/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts @@ -8,10 +8,6 @@ plugins { id("io.papermc.paperweight.userdev") } -configure { - banSlf4j = false -} - paperweight { injectPaperRepository = false } diff --git a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts index 02011915e0..d2595fee39 100644 --- a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts @@ -8,9 +8,6 @@ plugins { id("buildlogic.common") } -val commonJava = extensions.create("commonJava") -commonJava.banSlf4j.convention(true) - tasks .withType() .matching { it.name == "compileJava" || it.name == "compileTestJava" } @@ -67,16 +64,6 @@ configure { withSourcesJar() } -configurations["compileClasspath"].apply { - resolutionStrategy.componentSelection { - withModule("org.slf4j:slf4j-api") { - if (commonJava.banSlf4j.get()) { - reject("No SLF4J allowed on compile classpath") - } - } - } -} - tasks.named("check").configure { dependsOn("checkstyleMain", "checkstyleTest") } diff --git a/build-logic/src/main/kotlin/buildlogic/CommonJavaExtension.kt b/build-logic/src/main/kotlin/buildlogic/CommonJavaExtension.kt deleted file mode 100644 index 8631f53794..0000000000 --- a/build-logic/src/main/kotlin/buildlogic/CommonJavaExtension.kt +++ /dev/null @@ -1,7 +0,0 @@ -package buildlogic - -import org.gradle.api.provider.Property - -interface CommonJavaExtension { - val banSlf4j: Property -} diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index e3678ec6f4..4c533604de 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -145,6 +145,10 @@ Checks based on Google Checks, modified for EngineHub. + + + + diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 70801d5974..1a2f57e4e0 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -56,7 +56,6 @@ dependencies { because("Resolving Spigot annotations") } "compileOnly"(libs.paperApi) { - exclude("org.slf4j", "slf4j-api") exclude("junit", "junit") } "implementation"(libs.paperLib) diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts index a6af19e7bd..a9fa0be5a0 100644 --- a/worldedit-fabric/build.gradle.kts +++ b/worldedit-fabric/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id("buildlogic.platform") } -commonJava { - // Not easy to do, because it's in a bunch of separate configurations - banSlf4j = false -} - platform { kind = buildlogic.WorldEditKind.Mod includeClasspath = true diff --git a/worldedit-neoforge/build.gradle.kts b/worldedit-neoforge/build.gradle.kts index 0c5c61dd1f..18f2e45fe5 100644 --- a/worldedit-neoforge/build.gradle.kts +++ b/worldedit-neoforge/build.gradle.kts @@ -7,11 +7,6 @@ plugins { id("buildlogic.platform") } -commonJava { - // Not easy to do, because it's in a bunch of separate configurations - banSlf4j = false -} - platform { kind = buildlogic.WorldEditKind.Mod } diff --git a/worldedit-sponge/build.gradle.kts b/worldedit-sponge/build.gradle.kts index 34ac6bc042..56518fa73b 100644 --- a/worldedit-sponge/build.gradle.kts +++ b/worldedit-sponge/build.gradle.kts @@ -14,10 +14,6 @@ platform { includeClasspath = true } -commonJava { - banSlf4j = false -} - minecraft { injectRepositories(false) version(libs.versions.sponge.minecraft.get())