From b391c1cb92261c9a8f804dc86eac633a0a3f1fda Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 21 Dec 2021 01:17:52 -0800 Subject: [PATCH] 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. --- patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch | 2 +- patches/api/Build-system-changes.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch index 8d35c9f992..e7ca10d583 100644 --- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 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") ++ api("org.apache.logging.log4j:log4j-api:2.17.0") + api("org.slf4j:slf4j-api:1.8.0-beta4") implementation("org.ow2.asm:asm:9.2") diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index c5c95acf00..f6edbed244 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -29,9 +29,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 testCompileOnly(annotations) + // Paper start - add checker -+ val checkerAnnotations = "org.checkerframework:checker-qual:3.19.0" -+ compileOnlyApi(checkerAnnotations) -+ testCompileOnly(checkerAnnotations) ++ val checkerQual = "org.checkerframework:checker-qual:3.21.0" ++ compileOnlyApi(checkerQual) ++ testCompileOnly(checkerQual) + // Paper end + testImplementation("junit:junit:4.13.2")