From 5a55a1f6029e6cc8d13bd246b07cab26fdb910ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:47:13 +0100 Subject: [PATCH 1/7] Update dependency io.github.gradle-nexus.publish-plugin to v1.2.0 (#3966) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1056e32a6..17b5a85b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ http4j = "1.3" shadow = "7.1.2" grgit = "4.1.1" spotless = "6.15.0" -nexus = "1.1.0" +nexus = "1.2.0" [libraries] # Platform expectations From 94ca5cf679c81cb896f9dc6d96e767d4d8a7f2be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:47:31 +0100 Subject: [PATCH 2/7] Update dependency cloud.commandframework:cloud-services to v1.8.1 (#3965) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17b5a85b7..95a861b45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ mvdwapi = "3.1.1" # Third party prtree = "2.0.0" aopalliance = "1.0" -cloud-services = "1.8.0" +cloud-services = "1.8.1" arkitektonika = "2.1.1" squirrelid = "0.3.1" http4j = "1.3" From f5118e68028c4934edeb6380cac71bc5fab4f37f Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Thu, 23 Feb 2023 09:26:30 +0100 Subject: [PATCH 3/7] Don't fire 'PlotUnlinkEvent' twice on plot clear (#3947) --- Core/src/main/java/com/plotsquared/core/command/Clear.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java index 83a612951..039c37280 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Clear.java +++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java @@ -106,7 +106,6 @@ public class Clear extends Command { BackupManager.backup(player, plot, () -> { final long start = System.currentTimeMillis(); boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> { - plot.getPlotModificationManager().unlink(); TaskManager.runTask(() -> { plot.removeRunning(); // If the state changes, then mark it as no longer done From 97cdd03ea4350b2223c0403e60178cd7b8dd436c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 21:24:04 +0100 Subject: [PATCH 4/7] Update dependency gradle to v7.6.1 (#3967) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c4..508322917 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From dd6eb8e74ff4e0857c3bab7d511f296f7fa464ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 00:46:19 +0100 Subject: [PATCH 5/7] Update dependency cloud.commandframework:cloud-services to v1.8.2 (#3971) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95a861b45..d683df484 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ mvdwapi = "3.1.1" # Third party prtree = "2.0.0" aopalliance = "1.0" -cloud-services = "1.8.1" +cloud-services = "1.8.2" arkitektonika = "2.1.1" squirrelid = "0.3.1" http4j = "1.3" From b2ab61559c0e8ee45698a0a3651a450a1819d0f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 00:46:34 +0100 Subject: [PATCH 6/7] Update dependency com.diffplug.spotless to v6.16.0 (#3970) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d683df484..4a6c89d2a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ http4j = "1.3" # Gradle plugins shadow = "7.1.2" grgit = "4.1.1" -spotless = "6.15.0" +spotless = "6.16.0" nexus = "1.2.0" [libraries] From e98f628d34a0d340e464aa2da1359c5e0bb31603 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Thu, 2 Mar 2023 12:30:14 +0100 Subject: [PATCH 7/7] Pin GH actions to SHA to avoid mutable refs (#3973) --- .../workflows/announce-release-on-discord.yml | 3 +-- .github/workflows/build-pr.yml | 8 +++----- .github/workflows/build.yml | 8 +++----- .github/workflows/codeql.yml | 17 +++++------------ .github/workflows/release-drafter.yml | 6 ++---- 5 files changed, 14 insertions(+), 28 deletions(-) diff --git a/.github/workflows/announce-release-on-discord.yml b/.github/workflows/announce-release-on-discord.yml index 4e0eeef84..717c8ca0f 100644 --- a/.github/workflows/announce-release-on-discord.yml +++ b/.github/workflows/announce-release-on-discord.yml @@ -2,7 +2,6 @@ name: Announce release on discord on: release: types: [published] - jobs: send_announcement: runs-on: ubuntu-latest @@ -12,7 +11,7 @@ jobs: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} DISCORD_USERNAME: PlotSquared Release DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png - uses: Ilshidur/action-discord@0.3.2 + uses: Ilshidur/action-discord@0c4b27844ba47cb1c7bee539c8eead5284ce9fa9 # ratchet:Ilshidur/action-discord@0.3.2 with: args: | "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>" diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index b1ffd45a4..6ec60c0b1 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -1,19 +1,17 @@ name: Build PR - -on: [ pull_request ] - +on: [pull_request] jobs: build_pr: if: github.repository_owner == 'IntellectualSites' runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, windows-latest, macos-latest ] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - name: Checkout Repository uses: actions/checkout@v3 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1 - name: Setup Java uses: actions/setup-java@v3 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7d6fa81c..22bbf5b7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,8 @@ name: build - on: push: branches: - v6 - jobs: build: if: github.repository_owner == 'IntellectualSites' @@ -13,7 +11,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1 - name: Setup Java uses: actions/setup-java@v3 with: @@ -45,7 +43,7 @@ jobs: ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} - name: Publish core javadoc if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} - uses: cpina/github-action-push-to-another-repository@main + uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main env: SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} with: @@ -57,7 +55,7 @@ jobs: target-directory: core - name: Publish bukkit javadoc if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} - uses: cpina/github-action-push-to-another-repository@main + uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main env: SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 625a76a13..7ead4f468 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,10 +1,8 @@ name: "CodeQL" - on: pull_request: # The branches below must be a subset of the branches above - branches: [ v6 ] - + branches: [v6] jobs: analyze: name: Analyze @@ -13,23 +11,18 @@ jobs: actions: read contents: read security-events: write - strategy: fail-fast: false matrix: - language: [ 'java' ] - + language: ['java'] steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 with: languages: ${{ matrix.language }} - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - + uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 6fa4b5347..35dd31ae2 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -1,14 +1,12 @@ name: draft release - on: push: branches: - v6 pull_request: - types: [ opened, reopened, synchronize ] + types: [opened, reopened, synchronize] pull_request_target: - types: [ opened, reopened, synchronize ] - + types: [opened, reopened, synchronize] jobs: update_release_draft: if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}