diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 247f65f1e7..cc44f35dd2 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -10,11 +10,20 @@ diff --git a/build.gradle.kts b/build.gradle.kts index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/build.gradle.kts +++ b/build.gradle.kts +@@ -0,0 +0,0 @@ java { + withJavadocJar() + } + ++val adventureVersion = "4.8.1" ++ + dependencies { + // api dependencies are listed transitively to API consumers + api("commons-lang:commons-lang:2.6") @@ -0,0 +0,0 @@ dependencies { api("org.yaml:snakeyaml:1.28") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper api("it.unimi.dsi:fastutil:8.2.2") -+ api(platform("net.kyori:adventure-bom:4.8.1")) ++ api(platform("net.kyori:adventure-bom:$adventureVersion")) + api("net.kyori:adventure-api") + api("net.kyori:adventure-text-serializer-gson") + api("net.kyori:adventure-text-serializer-legacy") @@ -22,6 +31,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") +@@ -0,0 +0,0 @@ tasks.withType().configureEach { + "https://javadoc.io/doc/org.yaml/snakeyaml/1.27/", + "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", ++ // Paper start ++ "https://jd.adventure.kyori.net/api/$adventureVersion/", ++ "https://jd.adventure.kyori.net/text-serializer-gson/$adventureVersion/", ++ "https://jd.adventure.kyori.net/text-serializer-legacy/$adventureVersion/", ++ "https://jd.adventure.kyori.net/text-serializer-plain/$adventureVersion/", ++ // Paper end + ) + } diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/co/aikar/timings/TimingsReportListener.java diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index ae9db1df45..7e7626cd12 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -24,3 +24,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 compileOnly(annotations) testCompileOnly(annotations) +@@ -0,0 +0,0 @@ tasks.withType().configureEach { + (options as StandardJavadocDocletOptions).links( + "https://guava.dev/releases/21.0/api/docs/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.27/", +- "https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/", ++ "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) + } diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index 03d10d2ea0..cbac83b764 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + "https://guava.dev/releases/21.0/api/docs/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.27/", + "https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/", -+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/" ++ "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) +} diff --git a/pom.xml b/pom.xml