aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpowercas_gamer <[email protected]>2023-06-16 17:34:49 +0200
committerGitHub <[email protected]>2023-06-16 16:34:49 +0100
commit02e3b5a91a6fa36c8bf13b4090a7015101c7da90 (patch)
treec1d5a19e357247f5a300eb85f3e2d9626724d709
parent17966ddb8ebc544d90e49bc0b4aa049369be5efd (diff)
downloadPaper-02e3b5a91a6fa36c8bf13b4090a7015101c7da90.tar.gz
Paper-02e3b5a91a6fa36c8bf13b4090a7015101c7da90.zip
chore(api): add missing javadoc urls (#9355)
-rw-r--r--patches/api/0005-Adventure.patch5
-rw-r--r--patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch28
2 files changed, 27 insertions, 6 deletions
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 0a5e1f254f..e00d83832d 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
Co-authored-by: Jake Potrebic <[email protected]>
diff --git a/build.gradle.kts b/build.gradle.kts
-index 3e571743e76b26167e329dbd0a4c04ffd6427572..a6001fec6b8ff6a0d41336802d202e005ad2db81 100644
+index 3e571743e76b26167e329dbd0a4c04ffd6427572..7671b795188adfea56daea2d957e173c8d07c086 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,13 +8,26 @@ java {
@@ -52,7 +52,7 @@ index 3e571743e76b26167e329dbd0a4c04ffd6427572..a6001fec6b8ff6a0d41336802d202e00
// Paper end
compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
-@@ -82,10 +102,25 @@ tasks.withType<Javadoc> {
+@@ -82,10 +102,26 @@ tasks.withType<Javadoc> {
"https://guava.dev/releases/31.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
@@ -64,6 +64,7 @@ index 3e571743e76b26167e329dbd0a4c04ffd6427572..a6001fec6b8ff6a0d41336802d202e00
+ "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
+ "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
+ "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
++ "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/"
+ // Paper end
)
options.tags("apiNote:a:API Note:")
diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
index 60758dc706..4a5d850873 100644
--- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,18 +14,38 @@ 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 b0ca0ddffce2524e82d891c7a4d69d3ef9f2c097..4b2330bac734cd07f8798ceeb6d9c67bd3f3521d 100644
+index 98a7dfdcbcbb44e8f1d376cb213183592d03ea65..fb47a794893d5fef026a35a7c573becf74420aa0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -42,6 +42,8 @@ dependencies {
+@@ -9,6 +9,8 @@ java {
+ }
+
+ val adventureVersion = "4.14.0"
++val slf4jVersion = "1.8.0-beta4"
++val log4jVersion = "2.17.1"
+ val apiAndDocs: Configuration by configurations.creating {
+ attributes {
+ attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+@@ -42,6 +44,8 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
-+ api("org.apache.logging.log4j:log4j-api:2.17.1")
-+ api("org.slf4j:slf4j-api:1.8.0-beta4")
++ api("org.apache.logging.log4j:log4j-api:$log4jVersion")
++ api("org.slf4j:slf4j-api:$slf4jVersion")
implementation("org.ow2.asm:asm:9.4")
implementation("org.ow2.asm:asm-commons:9.4")
+@@ -112,7 +116,9 @@ tasks.withType<Javadoc> {
+ "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
+ "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
+ "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
+- "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/"
++ "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
++ "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
++ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/"
+ // Paper end
+ )
+ options.tags("apiNote:a:API Note:")
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index 8c76716249e44ed8bf6be94c1f5c7b6d9bb35be2..4eb639fbb46a0848be207149ea433455550fae1c 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java