From 10f09b938a4bfd56620b85ee02678a6f7c4ef09d Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 20 Jul 2022 13:16:13 -0300 Subject: [PATCH] [ci skip] Readd "Use" Javadoc tab (#8162) --- patches/api/0001-Convert-project-to-Gradle.patch | 5 +++-- patches/api/0002-Build-system-changes.patch | 6 +++--- patches/api/0005-Adventure.patch | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 7f4d3e1db..a3355cff9 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -27,10 +27,10 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21 +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..b81a893bd5418779544872eb4006adc6b3017a43 +index 0000000000000000000000000000000000000000..2c096b3ec6d77d824de974f9a6615916c0833e5f --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,80 @@ +@@ -0,0 +1,81 @@ +plugins { + `java-library` + `maven-publish` @@ -92,6 +92,7 @@ index 0000000000000000000000000000000000000000..b81a893bd5418779544872eb4006adc6 +tasks.withType { + val options = options as StandardJavadocDocletOptions + options.overview = "src/main/javadoc/overview.html" ++ options.use() + options.isDocFilesSubDirs = true + options.links( + "https://guava.dev/releases/31.0.1-jre/api/docs/", diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index 677a85f5e..8f14e4779 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index b81a893bd5418779544872eb4006adc6b3017a43..0b30b1f1be8818934ba530dd263fe6c9484983e8 100644 +index 2c096b3ec6d77d824de974f9a6615916c0833e5f..8472feb05de7955999bdfbbe721f2cfb847a9019 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,15 +14,27 @@ dependencies { @@ -37,7 +37,7 @@ index b81a893bd5418779544872eb4006adc6b3017a43..0b30b1f1be8818934ba530dd263fe6c9 testImplementation("org.apache.commons:commons-lang3:3.12.0") testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") -@@ -63,7 +75,7 @@ tasks.withType { +@@ -64,7 +76,7 @@ tasks.withType { options.links( "https://guava.dev/releases/31.0.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", @@ -46,7 +46,7 @@ index b81a893bd5418779544872eb4006adc6b3017a43..0b30b1f1be8818934ba530dd263fe6c9 "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", ) -@@ -78,3 +90,14 @@ tasks.withType { +@@ -79,3 +91,14 @@ tasks.withType { } } } diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index b28fbac9f..34fcc8490 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -7,7 +7,7 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index cedf145d5024e1ed9ae0d815e7ad0afb87c9a8b0..237a0beff61f2384b9e9e18a9d7119fd1916e1bd 100644 +index 79bf95d5a19046b142d0162dd6b739b7f0f52e59..84432bf9dd99332098f952ea777ee97d987f9eb2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,17 +8,37 @@ java { @@ -49,7 +49,7 @@ index cedf145d5024e1ed9ae0d815e7ad0afb87c9a8b0..237a0beff61f2384b9e9e18a9d7119fd // Paper end compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -@@ -77,9 +97,24 @@ tasks.withType { +@@ -78,9 +98,24 @@ tasks.withType { "https://guava.dev/releases/31.0.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations