From 02ae14894a23c2744b3fb48130d49efaaca799c3 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 9 Jan 2023 15:23:50 +0100 Subject: [PATCH 1/7] Stage 6.10.7 --- .github/workflows/build.yml | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bee920ea9..49ffbbf5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: fi - name: Publish Release if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} - run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository + run: ./gradlew publishToSonatype closeSonatypeStagingRepository env: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/build.gradle.kts b/build.gradle.kts index f76d616b4..9da000456 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.10.7-SNASPHOT" +version = "6.10.7" subprojects { group = rootProject.group From 577a0d8ed977a164185a47f48a96ef56e7cc4fb3 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 9 Jan 2023 15:28:31 +0100 Subject: [PATCH 2/7] Unstage 6.10.7 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9da000456..f76d616b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.10.7" +version = "6.10.7-SNASPHOT" subprojects { group = rootProject.group From 99ee8a780dd925eee34ba4c70bd9d7bd3de87071 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 9 Jan 2023 15:40:32 +0100 Subject: [PATCH 3/7] Back to snapshot for development --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f76d616b4..43dd987cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.10.7-SNASPHOT" +version = "6.10.7-SNAPSHOT" subprojects { group = rootProject.group From febac6fa40e31223ed9e4b32a2fa188c3cb806d0 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 9 Jan 2023 15:43:51 +0100 Subject: [PATCH 4/7] Release 6.10.8 --- .github/workflows/build.yml | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49ffbbf5c..bee920ea9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: fi - name: Publish Release if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} - run: ./gradlew publishToSonatype closeSonatypeStagingRepository + run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository env: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/build.gradle.kts b/build.gradle.kts index 43dd987cf..f589836dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.10.7-SNAPSHOT" +version = "6.10.8" subprojects { group = rootProject.group From bbf1e4fe6186d3e3dfdaa1c345dee444cc1b6248 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 9 Jan 2023 15:53:19 +0100 Subject: [PATCH 5/7] Back to snapshot for development --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f589836dd..c282e4539 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.10.8" +version = "6.10.9-SNAPSHOT" subprojects { group = rootProject.group From 0f0030916fc38f7e559773849778e7f4b13923a7 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Wed, 11 Jan 2023 18:25:51 +0100 Subject: [PATCH 6/7] Add source documentation to javadocs and add dependency tab (#3917) Get the most out of javadocs --- Bukkit/build.gradle.kts | 4 ++++ Core/build.gradle.kts | 4 ++++ .../java/com/plotsquared/core/events/PlayerAutoPlotEvent.java | 4 ++-- javadocfooter.html | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 javadocfooter.html diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index d56c2d74d..181f412d7 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -105,6 +105,10 @@ tasks { opt.links("https://jd.adventure.kyori.net/api/4.9.3/") opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/") opt.links("https://checkerframework.org/api/") + opt.isLinkSource = true + opt.bottom(File("$rootDir/javadocfooter.html").readText()) + opt.isUse = true opt.encoding("UTF-8") + opt.keyWords() } } diff --git a/Core/build.gradle.kts b/Core/build.gradle.kts index aa7e541db..322ac6319 100644 --- a/Core/build.gradle.kts +++ b/Core/build.gradle.kts @@ -71,6 +71,10 @@ tasks { opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/") opt.links("https://checkerframework.org/api/") opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/") + opt.isLinkSource = true + opt.bottom(File("$rootDir/javadocfooter.html").readText()) + opt.isUse = true opt.encoding("UTF-8") + opt.keyWords() } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java index 3fe14ce1b..03e9b10f9 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java @@ -114,7 +114,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve } /** - * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)} )} + * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)} */ @Deprecated(forRemoval = true, since = "6.1.0") public void setSize_x(int sizeX) { @@ -130,7 +130,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve } /** - * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)} )} + * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)} */ @Deprecated(forRemoval = true, since = "6.1.0") public void setSize_z(int sizeZ) { diff --git a/javadocfooter.html b/javadocfooter.html new file mode 100644 index 000000000..b6528c732 --- /dev/null +++ b/javadocfooter.html @@ -0,0 +1,4 @@ +Javadocs generated for + PlotSquared | + Documentation | +Visit us on our Discord server :) From 4aa7bc51bcd2834df546ecd519b74507ab7ff7e7 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Wed, 11 Jan 2023 22:11:11 +0100 Subject: [PATCH 7/7] Include missing javadoc option --- Bukkit/build.gradle.kts | 2 ++ Core/build.gradle.kts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 181f412d7..b40755efa 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -98,6 +98,7 @@ tasks.named("shadowJar") { tasks { withType { + val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString() val opt = options as StandardJavadocDocletOptions opt.links("https://jd.papermc.io/paper/1.18/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString()) @@ -110,5 +111,6 @@ tasks { opt.isUse = true opt.encoding("UTF-8") opt.keyWords() + opt.addStringOption("-since", isRelease) } } diff --git a/Core/build.gradle.kts b/Core/build.gradle.kts index 322ac6319..12d8dcb02 100644 --- a/Core/build.gradle.kts +++ b/Core/build.gradle.kts @@ -65,6 +65,7 @@ tasks.processResources { tasks { withType { + val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString() val opt = options as StandardJavadocDocletOptions opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString()) opt.links("https://jd.adventure.kyori.net/api/4.9.3/") @@ -76,5 +77,6 @@ tasks { opt.isUse = true opt.encoding("UTF-8") opt.keyWords() + opt.addStringOption("-since", isRelease) } }