Update Upstream

1f21162 Ensure the SLF4J ban is being applied
This commit is contained in:
NotMyFault 2021-07-09 11:08:17 +02:00
parent a183425642
commit 457861b879
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 10 additions and 8 deletions

View File

@ -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") { plugins.withId("java") {
the<JavaPluginExtension>().toolchain { the<JavaPluginExtension>().toolchain {
languageVersion.set(JavaLanguageVersion.of(16)) languageVersion.set(JavaLanguageVersion.of(16))

View File

@ -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 { // tasks.named("check").configure {
// dependsOn("checkstyleMain", "checkstyleTest") // dependsOn("checkstyleMain", "checkstyleTest")
// } // }