From 52eb3d820fc43678457087e38c478b28bab64d9b Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 09:58:10 -0500 Subject: [PATCH 01/37] Test out the prerelease action. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 738878dc..f0b1ebc6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Create release id: release - uses: rymndhng/release-on-push-action@v0.27.0 + uses: Multiverse/release-on-push-action@support_prerelease env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 2af835f0c3ceba0a8d9be1ed5f54b0f8da64f437 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 11:15:36 -0500 Subject: [PATCH 02/37] Publish prerelease versions as snapshots. --- .github/workflows/release.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0b1ebc6..ec433708 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,18 +37,32 @@ jobs: release_name: "Release " use_github_release_notes: true + - name: Get PR labels + id: pr-labels + uses: joerick/pr-labels-action@v1.0.7 + + - name: Modify version scheme + run: | + if [[ "${{ steps.pr-labels.outputs.labels }}" == *"prerelease"* ]]; then + echo "Replacing prerelease version scheme with SNAPSHOT" + echo "VERSION=$(echo ${{ steps.release.outputs.tag_name }} | sed -E 's/-pre.*/-SNAPSHOT/')" >> $GITHUB_ENV + else + echo "Using release version scheme" + echo "VERSION=${{ steps.release.outputs.tag_name }}" >> $GITHUB_ENV + fi + - name: Publish package uses: gradle/gradle-build-action@v2 with: arguments: publish env: - GITHUB_VERSION: ${{ steps.release.outputs.tag_name }} + GITHUB_VERSION: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload release artifact uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: build/libs/multiverse-core-${{ steps.release.outputs.tag_name }}.jar + file: build/libs/multiverse-core-${{ env.VERSION }}.jar asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar tag: ${{ steps.release.outputs.tag_name }} From b64e48769de7d7b66133a3adf5e7ca0a5fcc46c1 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 11:29:28 -0500 Subject: [PATCH 03/37] Check if the tag name contains pre instead of checking PR labels. --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec433708..498d42ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,13 +37,9 @@ jobs: release_name: "Release " use_github_release_notes: true - - name: Get PR labels - id: pr-labels - uses: joerick/pr-labels-action@v1.0.7 - - name: Modify version scheme run: | - if [[ "${{ steps.pr-labels.outputs.labels }}" == *"prerelease"* ]]; then + if [[ "${{ steps.release.outputs.tag_name }}" == *"pre"* ]]; then echo "Replacing prerelease version scheme with SNAPSHOT" echo "VERSION=$(echo ${{ steps.release.outputs.tag_name }} | sed -E 's/-pre.*/-SNAPSHOT/')" >> $GITHUB_ENV else From 7e5a3238b81ddfda99463574b935e5e257de503a Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 11:44:06 -0500 Subject: [PATCH 04/37] Drop "Release" prefix on release names. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 498d42ec..5cecab08 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: with: bump_version_scheme: norelease tag_prefix: '' - release_name: "Release " + release_name: "" use_github_release_notes: true - name: Modify version scheme From 9a9bfc03b9fbc31f3e4144f5c6ca080afe9d1971 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 11:57:02 -0500 Subject: [PATCH 05/37] Add space to trigger release. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a884097a..50cd0343 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,4 @@ Additionally, we would like to give a big thanks to everyone that has supported License ======= -Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info. +Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info. From d88bf6e1377d75a3d1e70dc3ae4623bf7bb0cd17 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 12:40:36 -0500 Subject: [PATCH 06/37] Remove space to test pre-releases --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50cd0343..a884097a 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,4 @@ Additionally, we would like to give a big thanks to everyone that has supported License ======= -Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info. +Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info. From f36a56e85445c06bbed7a5306d353b18fced1e77 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 24 Feb 2023 13:17:39 -0500 Subject: [PATCH 07/37] Use "no version bump" label instead of "no release". --- .github/workflows/require_label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/require_label.yml b/.github/workflows/require_label.yml index e4f9c293..13922340 100644 --- a/.github/workflows/require_label.yml +++ b/.github/workflows/require_label.yml @@ -15,4 +15,4 @@ jobs: with: mode: exactly count: 1 - labels: "release:major, release:minor, release:patch, no release" + labels: "release:major, release:minor, release:patch, no version bump" From 4e53d13290feafaf3463ba942402c72111fbff04 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:10:53 -0500 Subject: [PATCH 08/37] Add workflow for manually promoting a release. --- .github/workflows/promote_release.yml | 81 +++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/promote_release.yml diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml new file mode 100644 index 00000000..8b23aff4 --- /dev/null +++ b/.github/workflows/promote_release.yml @@ -0,0 +1,81 @@ +name: Manually promote last prerelease to release + +on: + workflow_dispatch: + inputs: + version: + description: 'Version to promote' + required: true + +jobs: + release_on_push: + runs-on: ubuntu-latest + steps: + - name: Verify input version is prerelease + run: | + if [[ "${{ github.event.inputs.version }}" != *"pre"* ]]; then + echo "Version must be a prerelease" + exit 1 + fi + + - name: Get release info + id: get-release + uses: cardinalby/git-get-release-action@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + tag: ${{ github.event.inputs.version }} + + - uses: actions/checkout@v3 + with: + ref: ${{ steps.get-release.outputs.tag_name }} + + - uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + cache: gradle + + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Remove prerelease tag + run: | + echo "Removing prerelease tag from version" + echo "VERSION=$(echo ${{ steps.get-release.outputs.tag_name }} | sed -E 's/-pre.*//')" >> $GITHUB_ENV + + - name: Build + uses: gradle/gradle-build-action@v2 + with: + arguments: clean build -x test + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_VERSION: ${{ env.VERSION }} + + - name: Create release + id: release + uses: Multiverse/release-on-push-action@support_prerelease + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_SHA: ${{ steps.get-release.outputs.tag_name }} + with: + bump_version_scheme: norelease + tag_prefix: '' + release_name: "" + use_github_release_notes: true + dry_run: true + +# - name: Publish package +# uses: gradle/gradle-build-action@v2 +# with: +# arguments: publish +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +# - name: Upload release artifact +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: build/libs/multiverse-core-${{ env.VERSION }}.jar +# asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar +# tag: ${{ steps.release.outputs.tag_name }} From 1bc4e68ff9e8b069e6bcb8e3475b47b7ec595817 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:20:40 -0500 Subject: [PATCH 09/37] Use promote scheme for manual workflow. --- .github/workflows/promote_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 8b23aff4..3c83adb9 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -54,12 +54,12 @@ jobs: - name: Create release id: release - uses: Multiverse/release-on-push-action@support_prerelease + uses: Multiverse/release-on-push-action@support_promote env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_SHA: ${{ steps.get-release.outputs.tag_name }} with: - bump_version_scheme: norelease + bump_version_scheme: promote tag_prefix: '' release_name: "" use_github_release_notes: true From 7065ffaea23b0786db7e02a4f207269505c94ab0 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:24:24 -0500 Subject: [PATCH 10/37] Remove checkstyle from promote workflow. --- .github/workflows/promote_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 3c83adb9..d5734544 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -47,7 +47,7 @@ jobs: - name: Build uses: gradle/gradle-build-action@v2 with: - arguments: clean build -x test + arguments: clean build -x test -x checkstyleMain -x checkstyleTest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_VERSION: ${{ env.VERSION }} From 06e9e33da4a8f5e1c5d99bc0bdc7ae4ec80ae9da Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:28:36 -0500 Subject: [PATCH 11/37] Workflow requires version bump type. --- .github/workflows/promote_release.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index d5734544..a162d0d5 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -6,6 +6,14 @@ on: version: description: 'Version to promote' required: true + version-bump: + description: 'Version bump to apply - should usually match the version bump used for the prerelease since last release' + required: true + type: choice + options: + - 'minor' + - 'major' + - 'patch' jobs: release_on_push: @@ -54,12 +62,12 @@ jobs: - name: Create release id: release - uses: Multiverse/release-on-push-action@support_promote + uses: Multiverse/release-on-push-action@support_prerelease env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_SHA: ${{ steps.get-release.outputs.tag_name }} with: - bump_version_scheme: promote + bump_version_scheme: ${{ github.event.inputs.version-bump }}} tag_prefix: '' release_name: "" use_github_release_notes: true From ee2a304148cb53b7f637f6a4fd8f9d8d4bb84f9d Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:31:49 -0500 Subject: [PATCH 12/37] Reorder version bump types. --- .github/workflows/promote_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index a162d0d5..787ea274 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -11,9 +11,9 @@ on: required: true type: choice options: + - 'patch' - 'minor' - 'major' - - 'patch' jobs: release_on_push: From cd895d03dc940ff4fbebf6f5a829df8cc5fb89bb Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:32:08 -0500 Subject: [PATCH 13/37] Remove extra } in bump_version_scheme. --- .github/workflows/promote_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 787ea274..7672888b 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -67,7 +67,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_SHA: ${{ steps.get-release.outputs.tag_name }} with: - bump_version_scheme: ${{ github.event.inputs.version-bump }}} + bump_version_scheme: ${{ github.event.inputs.version-bump }} tag_prefix: '' release_name: "" use_github_release_notes: true From 7bbeb9032018a8b1a4110e868501a94f2c191cb9 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:34:10 -0500 Subject: [PATCH 14/37] Remove dry_run. --- .github/workflows/promote_release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 7672888b..045ccd8b 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -71,7 +71,6 @@ jobs: tag_prefix: '' release_name: "" use_github_release_notes: true - dry_run: true # - name: Publish package # uses: gradle/gradle-build-action@v2 From 87b14d3944c5516d0175f5545772d409b4dcc694 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:34:24 -0500 Subject: [PATCH 15/37] Add publish and upload. --- .github/workflows/promote_release.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 045ccd8b..20a2f7e3 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -72,17 +72,17 @@ jobs: release_name: "" use_github_release_notes: true -# - name: Publish package -# uses: gradle/gradle-build-action@v2 -# with: -# arguments: publish -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Publish package + uses: gradle/gradle-build-action@v2 + with: + arguments: publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Upload release artifact -# uses: svenstaro/upload-release-action@v2 -# with: -# repo_token: ${{ secrets.GITHUB_TOKEN }} -# file: build/libs/multiverse-core-${{ env.VERSION }}.jar -# asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar -# tag: ${{ steps.release.outputs.tag_name }} + - name: Upload release artifact + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: build/libs/multiverse-core-${{ env.VERSION }}.jar + asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar + tag: ${{ steps.release.outputs.tag_name }} From 66e21da6b2cfcfc77d5f142a6466bfdca2d14bdd Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:39:59 -0500 Subject: [PATCH 16/37] Add version to publish action as well. --- .github/workflows/promote_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 20a2f7e3..3b963d41 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -78,6 +78,7 @@ jobs: arguments: publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_VERSION: ${{ env.VERSION }} - name: Upload release artifact uses: svenstaro/upload-release-action@v2 From cdf9767959870f600ec4ba2f6ff4fa2c177b472d Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 13:41:26 -0500 Subject: [PATCH 17/37] Use target_commitish for GITHUA_SHA. --- .github/workflows/promote_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 3b963d41..9d8ebe53 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -65,7 +65,7 @@ jobs: uses: Multiverse/release-on-push-action@support_prerelease env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_SHA: ${{ steps.get-release.outputs.tag_name }} + GITHUB_SHA: ${{ steps.get-release.outputs.target_commitish }} with: bump_version_scheme: ${{ github.event.inputs.version-bump }} tag_prefix: '' From 9725bdfeebe279b9e21a18a2396366a03c3846e1 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 14:02:01 -0500 Subject: [PATCH 18/37] Use ref input. --- .github/workflows/promote_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 9d8ebe53..ee348890 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -62,15 +62,15 @@ jobs: - name: Create release id: release - uses: Multiverse/release-on-push-action@support_prerelease + uses: Multiverse/release-on-push-action@support_ref_input env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_SHA: ${{ steps.get-release.outputs.target_commitish }} with: bump_version_scheme: ${{ github.event.inputs.version-bump }} tag_prefix: '' release_name: "" use_github_release_notes: true + ref: ${{ steps.get-release.outputs.target_commitish }} - name: Publish package uses: gradle/gradle-build-action@v2 From 01f745b0272d36d3acf28d872240c7f01e652148 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 19:39:14 -0500 Subject: [PATCH 19/37] Skip checking PR labels. --- .github/workflows/promote_release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index ee348890..1449dc31 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -62,7 +62,7 @@ jobs: - name: Create release id: release - uses: Multiverse/release-on-push-action@support_ref_input + uses: Multiverse/release-on-push-action@skip_prs env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -71,6 +71,7 @@ jobs: release_name: "" use_github_release_notes: true ref: ${{ steps.get-release.outputs.target_commitish }} + skip_prs: true - name: Publish package uses: gradle/gradle-build-action@v2 From 79b9c1231996b2a0116e3e0346bdb49d0e6070be Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 20:29:04 -0500 Subject: [PATCH 20/37] Change job name for manually promoting releases. --- .github/workflows/promote_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promote_release.yml b/.github/workflows/promote_release.yml index 1449dc31..5ee77d1d 100644 --- a/.github/workflows/promote_release.yml +++ b/.github/workflows/promote_release.yml @@ -16,7 +16,7 @@ on: - 'major' jobs: - release_on_push: + manually_promote_release: runs-on: ubuntu-latest steps: - name: Verify input version is prerelease From 073091525bbd3b5f34a28d90e1787330b30b0826 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 20:34:19 -0500 Subject: [PATCH 21/37] Label PRs automatically as prerelease. --- .github/labeler.yml | 2 ++ .github/workflows/pr_labeler.yml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/pr_labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000..0de407b5 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,2 @@ +prerelease: + - '*' diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml new file mode 100644 index 00000000..f993fcf5 --- /dev/null +++ b/.github/workflows/pr_labeler.yml @@ -0,0 +1,17 @@ +name: "Pull Request Labeler" + +on: + pull_request: + types: [opened] + branches: [main] + +jobs: + prerelease_labeler: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v4 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" From 2b97f7310f1b973198a2d1935df5c603a764cbd3 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 25 Feb 2023 20:39:56 -0500 Subject: [PATCH 22/37] Use pull_request_target for auto labeler. --- .github/workflows/pr_labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml index f993fcf5..69387def 100644 --- a/.github/workflows/pr_labeler.yml +++ b/.github/workflows/pr_labeler.yml @@ -1,7 +1,7 @@ name: "Pull Request Labeler" on: - pull_request: + pull_request_target: types: [opened] branches: [main] From 101ddae4434e880c4ad0d401c9b35ca8afa92457 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Tue, 28 Feb 2023 23:03:50 -0500 Subject: [PATCH 23/37] Create CODEOWNERS. --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..8ddb02e8 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @dumptruckman @benwoo1110 @nicegamer7 From d5ebde53b9b8dee278a7228079ee52ce022d1dcb Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Thu, 2 Mar 2023 12:32:07 +0800 Subject: [PATCH 24/37] Add maven central to repositories (#2859) Co-authored-by: Jeremy Wood --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index c4b2e7ca..5328d394 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,8 @@ java.sourceCompatibility = JavaVersion.VERSION_11 repositories { mavenLocal() + mavenCentral() + maven { url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/') } From 39287f55efbfa08db5f3e1114cc961d832cbd083 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Wed, 1 Mar 2023 23:36:41 -0500 Subject: [PATCH 25/37] Delete CODEOWNERS. --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 8ddb02e8..00000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @dumptruckman @benwoo1110 @nicegamer7 From e536dff1a88fd3fe98e6bf13965e1818d9f3353a Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 00:37:30 -0500 Subject: [PATCH 26/37] Use a separate bukkit dependency for tests. --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5328d394..790907de 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ repositories { } dependencies { - implementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { + compileOnly('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { exclude group: 'junit', module: 'junit' } @@ -66,6 +66,9 @@ dependencies { api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT' api 'org.jetbrains:annotations:16.0.2' + testImplementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { + exclude group: 'junit', module: 'junit' + } testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:3.11.2' testImplementation 'commons-io:commons-io:2.4' From 85d744d79f672731247903b382dfea376081417a Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 00:44:32 -0500 Subject: [PATCH 27/37] Run tests against spigot-api 1.19.3. --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 790907de..60ebea60 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,8 @@ dependencies { api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT' api 'org.jetbrains:annotations:16.0.2' - testImplementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { + testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' + testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } testImplementation 'junit:junit:4.12' From b6574245b8254468488765a105c6c5858fe6ae4e Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 00:48:54 -0500 Subject: [PATCH 28/37] Remove junit exclusion from compileOnly bukkit. --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 60ebea60..9e0beda1 100644 --- a/build.gradle +++ b/build.gradle @@ -43,9 +43,7 @@ repositories { } dependencies { - compileOnly('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') { - exclude group: 'junit', module: 'junit' - } + compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT' implementation('com.github.MilkBowl:VaultAPI:1.7') { exclude group: 'org.bukkit', module: 'bukkit' From 87225b1c65b54f06b09bdbe0ed44c56152d55783 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 01:20:38 -0500 Subject: [PATCH 29/37] Move old tests to old-test. --- build.gradle | 34 +++++++++++++++---- .../MultiverseCore/TestDebugMode.java | 0 .../MultiverseCore/TestEntitySpawnRules.java | 0 .../TestEntryFeeConversion.java | 0 .../MultiverseCore/TestModifyCommand.java | 0 .../MultiverseCore/TestWorldProperties.java | 0 .../MultiverseCore/TestWorldPurger.java | 0 .../MultiverseCore/TestWorldStuff.java | 0 .../MultiverseCore/utils/FileUtilsTest.java | 0 .../utils/MVTestLogFormatter.java | 0 .../utils/MockWorldFactory.java | 0 .../utils/TestInstanceCreator.java | 0 .../MultiverseCore/utils/Util.java | 0 .../utils/WorldCreatorMatcher.java | 0 .../org.mockito.plugins.MockMaker | 0 15 files changed, 27 insertions(+), 7 deletions(-) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestDebugMode.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestModifyCommand.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestWorldProperties.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestWorldPurger.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/TestWorldStuff.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/utils/Util.java (100%) rename src/{test => old-test}/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java (100%) rename src/{test => old-test}/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) diff --git a/build.gradle b/build.gradle index d36d117a..394464cb 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,11 @@ repositories { } } +configurations { + oldTestImplementation.extendsFrom implementation + oldTestRuntime.extendsFrom runtime +} + dependencies { compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' @@ -88,6 +93,15 @@ dependencies { testImplementation 'junit:junit:4.13.1' testImplementation 'org.mockito:mockito-core:3.11.2' testImplementation 'commons-io:commons-io:2.7' + + // Old Tests + oldTestImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' + oldTestImplementation('com.googlecode.json-simple:json-simple:1.1.1') { + exclude group: 'junit', module: 'junit' + } + oldTestImplementation 'junit:junit:4.13.1' + oldTestImplementation 'org.mockito:mockito-core:3.11.2' + oldTestImplementation 'commons-io:commons-io:2.7' } @@ -112,6 +126,19 @@ configurations { } } + +sourceSets { + oldTest { + java { + compileClasspath += main.output + runtimeClasspath += main.output + srcDir file('src/old-test/java') + } + resources.srcDir file('src/old-test/resources') + } +} + + publishing { publications { maven(MavenPublication) { @@ -191,10 +218,3 @@ shadowJar { build.dependsOn shadowJar jar.enabled = false - - -// Excludes all test -// TODO: Remove this when we have tests for MV5 -test { - exclude '**/*' -} diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestDebugMode.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestDebugMode.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestDebugMode.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java b/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java rename to src/old-test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java b/src/old-test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java rename to src/old-test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java b/src/old-test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java rename to src/old-test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java b/src/old-test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java rename to src/old-test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java b/src/old-test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java rename to src/old-test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/Util.java b/src/old-test/java/com/onarandombox/MultiverseCore/utils/Util.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/utils/Util.java rename to src/old-test/java/com/onarandombox/MultiverseCore/utils/Util.java diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java b/src/old-test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java similarity index 100% rename from src/test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java rename to src/old-test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/old-test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to src/old-test/resources/mockito-extensions/org.mockito.plugins.MockMaker From ed73fd059eb59de925532dfe41f19ab007e53c14 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 02:07:38 -0500 Subject: [PATCH 30/37] Add Kotlin dependency for tests only. --- build.gradle | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 394464cb..77e6901d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,18 @@ plugins { id 'maven-publish' id 'checkstyle' id 'com.github.johnrengelman.shadow' version '7.1.2' + id "org.jetbrains.kotlin.jvm" version "1.8.10" } version = System.getenv('GITHUB_VERSION') ?: 'local' group = 'com.onarandombox.multiversecore' description = 'Multiverse-Core' -java.sourceCompatibility = JavaVersion.VERSION_11 +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(11)) + } +} repositories { mavenLocal() @@ -86,6 +91,7 @@ dependencies { api 'org.jetbrains:annotations:22.0.0' // Tests + testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10' testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' @@ -173,6 +179,19 @@ compileJava { source = prepareSource.outputs } +compileKotlin { + // We're not using Kotlin in the plugin itself, just tests! + enabled = false +} +configurations { + compileOnly { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' + } + runtimeOnly { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' + } +} + processResources { def props = [version: "${project.version}"] inputs.properties props @@ -214,6 +233,12 @@ shadowJar { configurations = [project.configurations.api] archiveFileName = "$baseName-$version.$extension" + + dependencies { + exclude(dependency { + it.moduleGroup == 'org.jetbrains.kotlin' + }) + } } build.dependsOn shadowJar From 698d1c7954ec7b9dd9295f2edb9ea90195f30d6e Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 02:10:36 -0500 Subject: [PATCH 31/37] Switch to JUnit 5 for new tests. --- build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 77e6901d..c2c6dcd6 100644 --- a/build.gradle +++ b/build.gradle @@ -96,9 +96,7 @@ dependencies { testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } - testImplementation 'junit:junit:4.13.1' - testImplementation 'org.mockito:mockito-core:3.11.2' - testImplementation 'commons-io:commons-io:2.7' + testImplementation 'org.jetbrains.kotlin:kotlin-test' // Old Tests oldTestImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' @@ -243,3 +241,7 @@ shadowJar { build.dependsOn shadowJar jar.enabled = false + +test { + useJUnitPlatform() +} From eebb4a4a6d950d8e2289296eb56be97c6d627014 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 02:22:47 -0500 Subject: [PATCH 32/37] Implement initial test using MockBukkit. --- build.gradle | 4 +-- .../multiverse/core/MockBukkitTest.kt | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt diff --git a/build.gradle b/build.gradle index c2c6dcd6..2d632699 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ description = 'Multiverse-Core' java { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } @@ -92,7 +92,7 @@ dependencies { // Tests testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10' - testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' + testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.145.0' testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } diff --git a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt new file mode 100644 index 00000000..68dffc62 --- /dev/null +++ b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt @@ -0,0 +1,33 @@ +package org.mvplugins.multiverse.core + +import be.seeseemelk.mockbukkit.MockBukkit +import com.onarandombox.MultiverseCore.MultiverseCore +import com.onarandombox.MultiverseCore.utils.TestingMode +import org.bukkit.Server +import kotlin.test.AfterTest +import kotlin.test.BeforeTest +import kotlin.test.Test +import kotlin.test.assertNotNull + +class MockBukkitTest { + + lateinit var server: Server + lateinit var plugin: MultiverseCore + + @BeforeTest + fun setUp() { + TestingMode.enable() + server = MockBukkit.mock() + plugin = MockBukkit.load(MultiverseCore::class.java) + } + + @Test + fun test() { + assertNotNull(plugin) + } + + @AfterTest + fun tearDown() { + MockBukkit.unmock() + } +} From fc7509cca6ab51360abf17f4b380be15747c1de0 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 08:35:30 -0500 Subject: [PATCH 33/37] Use a better test method name. --- src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt index 68dffc62..cf6be2f4 100644 --- a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt @@ -22,7 +22,7 @@ class MockBukkitTest { } @Test - fun test() { + fun `MockBukkit loads the plugin`() { assertNotNull(plugin) } From 65cb3f7037c271415f1a37a31c381096256e9d39 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 08:35:52 -0500 Subject: [PATCH 34/37] Put test method after tearDown. --- .../org/mvplugins/multiverse/core/MockBukkitTest.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt index cf6be2f4..8094910e 100644 --- a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt @@ -21,13 +21,13 @@ class MockBukkitTest { plugin = MockBukkit.load(MultiverseCore::class.java) } - @Test - fun `MockBukkit loads the plugin`() { - assertNotNull(plugin) - } - @AfterTest fun tearDown() { MockBukkit.unmock() } + + @Test + fun `MockBukkit loads the plugin`() { + assertNotNull(plugin) + } } From a4e84ad58107703c7f0c64acfb8a12a6c9ed7bfb Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Thu, 2 Mar 2023 08:36:43 -0500 Subject: [PATCH 35/37] Use ServerMock instead of Server. --- src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt index 8094910e..894125bf 100644 --- a/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/MockBukkitTest.kt @@ -1,9 +1,9 @@ package org.mvplugins.multiverse.core import be.seeseemelk.mockbukkit.MockBukkit +import be.seeseemelk.mockbukkit.ServerMock import com.onarandombox.MultiverseCore.MultiverseCore import com.onarandombox.MultiverseCore.utils.TestingMode -import org.bukkit.Server import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test @@ -11,7 +11,7 @@ import kotlin.test.assertNotNull class MockBukkitTest { - lateinit var server: Server + lateinit var server: ServerMock lateinit var plugin: MultiverseCore @BeforeTest From a255f55b6f6305d86c70f7cdb47427eda30389b2 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 3 Mar 2023 08:27:12 -0500 Subject: [PATCH 36/37] Downgrade MockBukkit to 2.141.0. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2d632699..98d22ad0 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ dependencies { // Tests testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10' - testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.145.0' + testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.141.0' testImplementation('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } From 3f6c3047d86b35698cad86aa6e4fa70d213781bf Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Fri, 3 Mar 2023 22:23:39 +0800 Subject: [PATCH 37/37] fix: Restore locales setup method (#2881) --- .../onarandombox/MultiverseCore/MultiverseCore.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index a9e3c2b1..41743b88 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -166,6 +166,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore { this.anchorManager.loadAnchors(); this.registerEvents(); this.registerCommands(); + this.setUpLocales(); this.registerDestinations(); this.setupMetrics(); this.saveMVConfig(); @@ -217,6 +218,15 @@ public class MultiverseCore extends JavaPlugin implements MVCore { this.commandManager.registerCommand(new UnloadCommand(this)); } + /** + * Register locales + */ + private void setUpLocales() { + this.commandManager.usePerIssuerLocale(true, true); + this.commandManager.getLocales().addFileResClassLoader(this); + this.commandManager.getLocales().addMessageBundles("multiverse-core"); + } + /** * Register all the destinations. */