From f0cf1b7d4cf96ee3b5489878f934bb732f3f126a Mon Sep 17 00:00:00 2001
From: Zax71 <zabax32@gmail.com>
Date: Wed, 7 Aug 2024 13:10:26 +0100
Subject: [PATCH 01/14] Change versions to support 1.21

---
 .github/workflows/generic.platform_uploads.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/generic.platform_uploads.yml b/.github/workflows/generic.platform_uploads.yml
index ccd31a40..69f9a3a4 100644
--- a/.github/workflows/generic.platform_uploads.yml
+++ b/.github/workflows/generic.platform_uploads.yml
@@ -107,7 +107,7 @@ jobs:
         files: '["${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar"]'
         name: ${{ steps.release-info.outputs.tag_name }}
         changelog: ${{ steps.release-artifact.outputs.body }}
-        game_versions: 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
+        game_versions: 1.21 1.20.4 1.20.3 1.20.2 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
         version_type: ${{ steps.parse-release-type.outputs.release_type }}
         loaders: bukkit, spigot, paper
         dependencies: ${{ inputs.modrinth_dependencies }}
@@ -121,7 +121,7 @@ jobs:
         changelog: ${{ steps.release-artifact.outputs.body }}
         changelog_type: markdown
         display_name: ${{ steps.release-info.outputs.tag_name }}
-        game_versions: 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
+        game_versions: 1.21 1.20.4 1.20.3 1.20.2 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
         release_type: ${{ steps.parse-release-type.outputs.release_type }}
         project_relations: ${{ inputs.dbo_project_relations }}
         file_path: ${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar
@@ -136,5 +136,5 @@ jobs:
         channel: ${{ steps.parse-release-type.outputs.release_type }}
         files: '[{"path": "${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar", "platforms": ["PAPER"]}]'
         description: ${{ steps.release-artifact.outputs.body }}
-        platform_dependencies: '{"PAPER": ["1.13-1.20.1"]}'
+        platform_dependencies: '{"PAPER": ["1.13-1.21"]}'
         plugin_dependencies: ${{ inputs.hangar_plugin_dependencies }}

From 9c519e1ea44c738a8dbe7f17a8441d6f7faa2bb8 Mon Sep 17 00:00:00 2001
From: Zax71 <zabax32@gmail.com>
Date: Wed, 7 Aug 2024 15:42:55 +0100
Subject: [PATCH 02/14] Maybe don't be so dumb this time

---
 .github/workflows/generic.platform_uploads.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generic.platform_uploads.yml b/.github/workflows/generic.platform_uploads.yml
index 69f9a3a4..3da9eeb8 100644
--- a/.github/workflows/generic.platform_uploads.yml
+++ b/.github/workflows/generic.platform_uploads.yml
@@ -107,7 +107,7 @@ jobs:
         files: '["${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar"]'
         name: ${{ steps.release-info.outputs.tag_name }}
         changelog: ${{ steps.release-artifact.outputs.body }}
-        game_versions: 1.21 1.20.4 1.20.3 1.20.2 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
+        game_versions: 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
         version_type: ${{ steps.parse-release-type.outputs.release_type }}
         loaders: bukkit, spigot, paper
         dependencies: ${{ inputs.modrinth_dependencies }}
@@ -121,7 +121,7 @@ jobs:
         changelog: ${{ steps.release-artifact.outputs.body }}
         changelog_type: markdown
         display_name: ${{ steps.release-info.outputs.tag_name }}
-        game_versions: 1.21 1.20.4 1.20.3 1.20.2 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
+        game_versions: 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
         release_type: ${{ steps.parse-release-type.outputs.release_type }}
         project_relations: ${{ inputs.dbo_project_relations }}
         file_path: ${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar

From 006fe56d189303b88a8285e5e607ea3baf87a8d7 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:41:39 +0800
Subject: [PATCH 03/14] Fix edge case where PlayerTeleportEvent getTo is null

---
 .../MultiverseCore/listeners/MVPlayerListener.java           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
index e025aa95..0dbe76a3 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
@@ -169,6 +169,10 @@ public class MVPlayerListener implements Listener {
         if (event.isCancelled()) {
             return;
         }
+        if (event.getTo() == null) {
+            Logging.fine("Player '" + event.getPlayer().getName() + "' is teleporting to a null location!");
+            return;
+        }
         Player teleportee = event.getPlayer();
         CommandSender teleporter = teleportee;
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
@@ -284,6 +288,7 @@ public class MVPlayerListener implements Listener {
         }
         // The adjust should have happened much earlier.
         if (event.getTo() == null) {
+            Logging.fine("Player '" + event.getPlayer().getName() + "' is portaling to NULL location.");
             return;
         }
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());

From e13349949abd0cc9f6a17f34cf832172291306ab Mon Sep 17 00:00:00 2001
From: Zax71 <zabax32@gmail.com>
Date: Fri, 23 Aug 2024 12:08:41 +0100
Subject: [PATCH 04/14] Update to 1.21.1

---
 .github/workflows/generic.platform_uploads.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/generic.platform_uploads.yml b/.github/workflows/generic.platform_uploads.yml
index 3da9eeb8..8c957b60 100644
--- a/.github/workflows/generic.platform_uploads.yml
+++ b/.github/workflows/generic.platform_uploads.yml
@@ -107,7 +107,7 @@ jobs:
         files: '["${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar"]'
         name: ${{ steps.release-info.outputs.tag_name }}
         changelog: ${{ steps.release-artifact.outputs.body }}
-        game_versions: 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
+        game_versions: 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
         version_type: ${{ steps.parse-release-type.outputs.release_type }}
         loaders: bukkit, spigot, paper
         dependencies: ${{ inputs.modrinth_dependencies }}
@@ -121,7 +121,7 @@ jobs:
         changelog: ${{ steps.release-artifact.outputs.body }}
         changelog_type: markdown
         display_name: ${{ steps.release-info.outputs.tag_name }}
-        game_versions: 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
+        game_versions: 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
         release_type: ${{ steps.parse-release-type.outputs.release_type }}
         project_relations: ${{ inputs.dbo_project_relations }}
         file_path: ${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar
@@ -136,5 +136,5 @@ jobs:
         channel: ${{ steps.parse-release-type.outputs.release_type }}
         files: '[{"path": "${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar", "platforms": ["PAPER"]}]'
         description: ${{ steps.release-artifact.outputs.body }}
-        platform_dependencies: '{"PAPER": ["1.13-1.21"]}'
+        platform_dependencies: '{"PAPER": ["1.13-1.21.1"]}'
         plugin_dependencies: ${{ inputs.hangar_plugin_dependencies }}

From 1547ea84c6ddf039e64ca28b043f8bf475cc64a8 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Sun, 13 Oct 2024 10:54:19 +0800
Subject: [PATCH 05/14] Comment build artifact in PR

---
 .github/workflows/generic.test.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generic.test.yml b/.github/workflows/generic.test.yml
index e7476034..1cb1af6b 100644
--- a/.github/workflows/generic.test.yml
+++ b/.github/workflows/generic.test.yml
@@ -9,7 +9,7 @@ on:
         type: string
 
 jobs:
-  test:
+  test-and-artifact:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -38,3 +38,13 @@ jobs:
         with:
           name: ${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}
           path: build/libs/${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}.jar
+
+  comment-artifact:
+    needs: test-and-artifact
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: benwoo1110/artifact-comment-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

From 17d376d4d4484a871f9faa4f6fc00668fb514248 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Sun, 13 Oct 2024 10:54:38 +0800
Subject: [PATCH 06/14] Bump upload artifact action to v4

---
 .github/workflows/generic.test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generic.test.yml b/.github/workflows/generic.test.yml
index 1cb1af6b..3713010b 100644
--- a/.github/workflows/generic.test.yml
+++ b/.github/workflows/generic.test.yml
@@ -34,7 +34,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Artifact output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}
           path: build/libs/${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}.jar

From 52b2170f8fa0fa8eeaf78224ef6fe354a0db5c21 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:22:30 +0800
Subject: [PATCH 07/14] Deploy javadoc to github pages on release

---
 .github/workflows/generic.github_release.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index 423c868c..d65943db 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -89,3 +89,23 @@ jobs:
           file: build/libs/${{ inputs.plugin_name }}-${{ steps.release.outputs.publish_version }}.jar
           asset_name: ${{ inputs.plugin_name }}-${{ steps.release.outputs.tag_name }}.jar
           tag: ${{ steps.release.outputs.tag_name }}
+
+      - name: Generate javadoc
+        id: javadoc
+        if: steps.release.outputs.release_created == 'true' && steps.release.outputs.release_type == 'release'
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: javadoc
+        env:
+          GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy javadoc to gh pages
+        if: steps.javadoc.outcome == 'success'
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          folder: build/docs/javadoc
+          branch: javadoc
+          target-folder: javadoc/${{ steps.release.outputs.tag_name }}
+          commit-message: Deploy javadoc for ${{ steps.release.outputs.tag_name }}

From c66b1a2b96e6e1b3cbb758589c30df9a438b28f0 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:25:13 +0800
Subject: [PATCH 08/14] Add manual dispatch action for javadoc

---
 .github/workflows/dispatch.javadoc.yml | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/dispatch.javadoc.yml

diff --git a/.github/workflows/dispatch.javadoc.yml b/.github/workflows/dispatch.javadoc.yml
new file mode 100644
index 00000000..77789d0f
--- /dev/null
+++ b/.github/workflows/dispatch.javadoc.yml
@@ -0,0 +1,39 @@
+name: 'Dispatch: Deploy Javadoc'
+
+on:
+  workflow_dispatch:
+    inputs:
+      target_tag:
+        description: 'Version to generate javadoc'
+        required: true
+
+jobs:
+  javadocs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.target_tag }}
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+      
+      - name: build javadoc
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: javadoc
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_VERSION: ${{ inputs.target_tag }}
+      
+      - name: Deploy javadoc to gh pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          folder: build/docs/javadoc
+          branch: javadoc
+          target-folder: javadoc/${{ inputs.target_tag }}
+          commit-message: Deploy javadoc for ${{ inputs.target_tag }}

From ecca904aef11446737412ddff26c60e01cbdc2f4 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:26:32 +0800
Subject: [PATCH 09/14] Add latest dir for javadoc

---
 .github/workflows/dispatch.javadoc.yml       | 14 +++++++++++---
 .github/workflows/generic.github_release.yml | 13 +++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dispatch.javadoc.yml b/.github/workflows/dispatch.javadoc.yml
index 77789d0f..7711830e 100644
--- a/.github/workflows/dispatch.javadoc.yml
+++ b/.github/workflows/dispatch.javadoc.yml
@@ -28,12 +28,20 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_VERSION: ${{ inputs.target_tag }}
-      
+
+      - name: Copy javadoc to version and latest folder
+        run: |
+          mkdir -p build/docs/javadoc-deploy/latest
+          mkdir -p build/docs/javadoc-deploy/${{ inputs.target_tag }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/${{ inputs.target_tag }}
+
       - name: Deploy javadoc to gh pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          folder: build/docs/javadoc
+          folder: build/docs/javadoc-deploy
           branch: javadoc
-          target-folder: javadoc/${{ inputs.target_tag }}
+          target-folder: javadoc
+          clean: false
           commit-message: Deploy javadoc for ${{ inputs.target_tag }}
diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index d65943db..e901a8fc 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -100,12 +100,21 @@ jobs:
           GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Copy javadoc to version and latest folder
+        if: steps.javadoc.outcome == 'success'
+        run: |
+          mkdir -p build/docs/javadoc-deploy/latest
+          mkdir -p build/docs/javadoc-deploy/${{ steps.release.outputs.tag_name }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy${{ steps.release.outputs.tag_name }}
+
       - name: Deploy javadoc to gh pages
         if: steps.javadoc.outcome == 'success'
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          folder: build/docs/javadoc
+          folder: build/docs/javadoc-deploy
           branch: javadoc
-          target-folder: javadoc/${{ steps.release.outputs.tag_name }}
+          target-folder: javadoc
+          clean: false
           commit-message: Deploy javadoc for ${{ steps.release.outputs.tag_name }}

From 99a716ccaaf53b0e451fb65996b5b2d83e857b50 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:38:42 +0800
Subject: [PATCH 10/14] latest boolean

---
 .github/workflows/dispatch.javadoc.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dispatch.javadoc.yml b/.github/workflows/dispatch.javadoc.yml
index 7711830e..891e8c11 100644
--- a/.github/workflows/dispatch.javadoc.yml
+++ b/.github/workflows/dispatch.javadoc.yml
@@ -6,6 +6,9 @@ on:
       target_tag:
         description: 'Version to generate javadoc'
         required: true
+      replace_latest:
+        description: 'Should this release replace the latest folder'
+        type: boolean
 
 jobs:
   javadocs:
@@ -29,12 +32,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_VERSION: ${{ inputs.target_tag }}
 
-      - name: Copy javadoc to version and latest folder
+      - name: Copy javadoc to deploy folder
+        run: |
+          mkdir -p build/docs/javadoc-deploy/${{ inputs.target_tag }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/${{ inputs.target_tag }}
+
+      - name: Copy javadoc to latest folder
+        if: inputs.replace_latest
         run: |
           mkdir -p build/docs/javadoc-deploy/latest
-          mkdir -p build/docs/javadoc-deploy/${{ inputs.target_tag }}
           cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
-          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/${{ inputs.target_tag }}
 
       - name: Deploy javadoc to gh pages
         uses: JamesIves/github-pages-deploy-action@v4

From 41cab5b290fd3677117d979c06a289f35dc1eabd Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:40:53 +0800
Subject: [PATCH 11/14] Improve replace_latest description

---
 .github/workflows/dispatch.javadoc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch.javadoc.yml b/.github/workflows/dispatch.javadoc.yml
index 891e8c11..54637485 100644
--- a/.github/workflows/dispatch.javadoc.yml
+++ b/.github/workflows/dispatch.javadoc.yml
@@ -7,7 +7,7 @@ on:
         description: 'Version to generate javadoc'
         required: true
       replace_latest:
-        description: 'Should this release replace the latest folder'
+        description: 'Replace the latest folder'
         type: boolean
 
 jobs:

From fa30b432a934d7c5f197c7b5fb9d52ae4600fa2e Mon Sep 17 00:00:00 2001
From: Jeremy Wood <jeremy.wood@7factor.io>
Date: Fri, 15 Nov 2024 23:19:53 -0500
Subject: [PATCH 12/14] Publish to new repo using temp url.

---
 .github/workflows/generic.github_release.yml |  7 ++++++-
 build.gradle                                 | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index e901a8fc..c2af1f1f 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -76,7 +76,12 @@ jobs:
         if: steps.release.outputs.release_created == 'true'
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: publish -x test
+          arguments: |
+            publish -x test \
+              -PmultiverseReleasesUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} \
+              -PmultiverseReleasesPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }} \
+              -PmultiverseSnapshotsUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} \
+              -PmultiverseSnapshotsPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
         env:
           GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle b/build.gradle
index b3297e9c..f6bcc82f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,6 +126,16 @@ publishing {
                 password = System.getenv("GITHUB_TOKEN")
             }
         }
+        maven {
+            name = "multiverseReleases"
+            url = "https://repo.dumptruckman.com/multiverse-releases"
+            credentials(PasswordCredentials)
+        }
+        maven {
+            name = "multiverseSnapshots"
+            url = "https://repo.dumptruckman.com/multiverse-snapshots"
+            credentials(PasswordCredentials)
+        }
     }
 }
 

From 656b318be33f6d18b8fc1b4e2e0c763de5ada5b5 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:27:32 +0800
Subject: [PATCH 13/14] Fix gha publish command

---
 .github/workflows/generic.github_release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index c2af1f1f..616fb444 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -76,11 +76,11 @@ jobs:
         if: steps.release.outputs.release_created == 'true'
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: |
-            publish -x test \
-              -PmultiverseReleasesUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} \
-              -PmultiverseReleasesPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }} \
-              -PmultiverseSnapshotsUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} \
+          arguments: >
+            publish -x test
+              -PmultiverseReleasesUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
+              -PmultiverseReleasesPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
+              -PmultiverseSnapshotsUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
               -PmultiverseSnapshotsPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
         env:
           GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}

From c4d01b65b79669d8f538ff889e9185680e37f25e Mon Sep 17 00:00:00 2001
From: Jeremy Wood <jeremy.wood@7factor.io>
Date: Mon, 18 Nov 2024 15:36:47 -0500
Subject: [PATCH 14/14] Publish to correct repo url based on version.

---
 .github/workflows/generic.github_release.yml |  6 ++----
 build.gradle                                 | 11 ++++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index 616fb444..a75ea2c0 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -78,10 +78,8 @@ jobs:
         with:
           arguments: >
             publish -x test
-              -PmultiverseReleasesUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
-              -PmultiverseReleasesPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
-              -PmultiverseSnapshotsUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
-              -PmultiverseSnapshotsPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
+              -PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
+              -PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
         env:
           GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle b/build.gradle
index f6bcc82f..4ff62e25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,13 +127,10 @@ publishing {
             }
         }
         maven {
-            name = "multiverseReleases"
-            url = "https://repo.dumptruckman.com/multiverse-releases"
-            credentials(PasswordCredentials)
-        }
-        maven {
-            name = "multiverseSnapshots"
-            url = "https://repo.dumptruckman.com/multiverse-snapshots"
+            name = "multiverse"
+            def releasesRepoUrl = "https://repo.dumptruckman.com/multiverse-releases"
+            def snapshotsRepoUrl = "https://repo.dumptruckman.com/multiverse-snapshots"
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
             credentials(PasswordCredentials)
         }
     }