mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove redundant json-simple dependency and move isTransitive = false from server to api

Browse source
This commit is contained in:
Jason Penilla 2021-11-26 22:54:18 -08:00 • committed by MiniDigger | Martin
parent 231e0cd3b5
commit c0f2385c99
11 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
View file

@ -14,18 +14,18 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction.
diff --git a/build.gradle.kts b/build.gradle.kts
index af2f95b6c6a71b4919edb38e520292676c1cc25d..720ba2774196f24cca6c4d1b173f90f8151c8a5e 100644
index 5a1b66c6692451a78be6c4adb103de34bb06b056..591f30a41d6f39683c60758c2e9f32bb6b476a62 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,6 +35,8 @@ dependencies {
@@ -38,6 +38,8 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-gson")
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")
+ api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
+ api("org.slf4j:slf4j-api:1.7.30") // Paper
+ api("org.apache.logging.log4j:log4j-api:2.14.1")
+ api("org.slf4j:slf4j-api:1.8.0-beta4")
implementation("org.ow2.asm:asm:9.1")
implementation("org.ow2.asm:asm-commons:9.1")
implementation("org.ow2.asm:asm:9.2")
implementation("org.ow2.asm:asm-commons:9.2")
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index 03ca87a1cbace2459174bb7bb8847bda766e80c5..c25fc646be750d3a3b2f4fb3f1c53daee5254107 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java