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

Update API patches

Browse source
This commit is contained in:
Jason Penilla 2021-11-21 21:21:37 -08:00
commit 0d44fec1fb
4 changed files with 25 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/api/Build-system-changes.patch
View file

@ -9,11 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -0,0 +0,0 @@ dependencies {
// api dependencies are listed transitively to API consumers
api("commons-lang:commons-lang:2.6")
api("com.google.guava:guava:21.0")
- api("com.google.code.gson:gson:2.8.0")
+ api("com.google.code.gson:gson:2.8.8") // Paper - bump
api("com.google.code.gson:gson:2.8.8")
api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.28")
+ api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
@ -29,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
testCompileOnly(annotations)
+ // Paper start - add checker
+ val checkerAnnotations = "org.checkerframework:checker-qual:3.18.0"
+ val checkerAnnotations = "org.checkerframework:checker-qual:3.19.0"
+ compileOnlyApi(checkerAnnotations)
+ testCompileOnly(checkerAnnotations)
+ // Paper end
@ -39,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
testImplementation("org.ow2.asm:asm-tree:9.2")
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
(options as StandardJavadocDocletOptions).links(
"https://guava.dev/releases/21.0/api/docs/",
"https://guava.dev/releases/31.0.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/",
+ "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations