Skip to content

Commit df8d28a

Browse files
committed
Update checker framework & log4j-api for paper-api (also rebuild patches)
Note that the log4j-api version used in paper-api does not affect the version used in paper-server, this just affects the version people will see in their IDE when compiling against paper-api.
1 parent 8a9979c commit df8d28a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

patches/api/0002-Build-system-changes.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index c76bfbcfbe034700bdbd9396643cfca625273a14..364b6215d2facb0273a67ff605ccb8e707e080b8 100644
8+
index c76bfbcfbe034700bdbd9396643cfca625273a14..1f680baffba17265e8ce38b3516624bffd034075 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -15,15 +15,27 @@ dependencies {
@@ -29,9 +29,9 @@ index c76bfbcfbe034700bdbd9396643cfca625273a14..364b6215d2facb0273a67ff605ccb8e7
2929
testCompileOnly(annotations)
3030

3131
+ // Paper start - add checker
32-
+ val checkerAnnotations = "org.checkerframework:checker-qual:3.19.0"
33-
+ compileOnlyApi(checkerAnnotations)
34-
+ testCompileOnly(checkerAnnotations)
32+
+ val checkerQual = "org.checkerframework:checker-qual:3.21.0"
33+
+ compileOnlyApi(checkerQual)
34+
+ testCompileOnly(checkerQual)
3535
+ // Paper end
3636
+
3737
testImplementation("junit:junit:4.13.2")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ it without having to shade it in the plugin and going through
1414
several layers of logging abstraction.
1515

1616
diff --git a/build.gradle.kts b/build.gradle.kts
17-
index 5a1b66c6692451a78be6c4adb103de34bb06b056..591f30a41d6f39683c60758c2e9f32bb6b476a62 100644
17+
index d8d459561cc75935136f8f9888ff27b45ad98f9e..a23b2bd8e1ca1ff8d0ad5ed5d5e41c89e4795090 100644
1818
--- a/build.gradle.kts
1919
+++ b/build.gradle.kts
2020
@@ -38,6 +38,8 @@ dependencies {
2121
apiAndDocs("net.kyori:adventure-text-serializer-gson")
2222
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
2323
apiAndDocs("net.kyori:adventure-text-serializer-plain")
24-
+ api("org.apache.logging.log4j:log4j-api:2.14.1")
24+
+ api("org.apache.logging.log4j:log4j-api:2.17.0")
2525
+ api("org.slf4j:slf4j-api:1.8.0-beta4")
2626

2727
implementation("org.ow2.asm:asm:9.2")

0 commit comments

Comments
 (0)