From 3ae49100628b59bee6c553e94f3ad4003e022755 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 20 Jul 2024 20:23:01 +0200 Subject: [PATCH] chore: upgrade refined architect Mdg is on the gradle plugin portal. --- .github/CONTRIBUTING.md | 5 +++-- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../workflows/issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .github/workflows/validate-commit-messages.yml | 2 +- gradle.properties | 1 + settings.gradle.kts | 15 ++++++--------- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 68a16fe..05e604b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,7 +9,8 @@ or any other method with the owners of this repository before making a change. These are the most important things to know before contributing (also explained in more detail later in this document): - Commit messages must adhere to [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/). -- Branch names must be formatted correctly. The format is `{category}/GH-{issue number}/{lowercase-description}`. +- Branch names must be formatted correctly. The format is `{category}/GH-{issue number}/{lowercase-description}`. You + can also use `NO-ISSUE` instead of a GitHub issue number. Category must match a category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). - We use [Checkstyle](https://checkstyle.sourceforge.io/) in our build workflow to validate coding style. It is @@ -47,7 +48,7 @@ Because we use merge commits when merging a PR, branch names will be part of the branch names must follow a certain standard. The format is `{category}/GH-{issue number}/{lowercase-description}` and a branch name can be maximum 50 characters of -length. +length. You can also use `NO-ISSUE` instead of a GitHub issue number. Category must match a category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a157d3d..869dafc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.4 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.7 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 2300f88..31fd136 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.4 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.7 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 7444dec..59ca50f 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index b2b9bdf..4c73f7a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.4 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.7 secrets: inherit with: project-name: 'Refined Storage - JEI Integration' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index ee10c5c..85e717b 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * *' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 1614152..b13799f 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index d2a2d80..47db6c5 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.7 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 449efa5..ea9f66e 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.7 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 40da4ed..804ec2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +refinedarchitectVersion=0.16.7 refinedstorageVersion=2.0.0-milestone.4.4 jeiVersion=19.4.0.28 minecraftVersion=1.21 diff --git a/settings.gradle.kts b/settings.gradle.kts index 31b3be3..68e57da 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,17 +13,14 @@ pluginManagement { name = "Fabric" url = uri("https://maven.fabricmc.net/") } - maven { - name = "NeoForge" - url = uri("https://maven.neoforged.net/releases") - } } + val refinedarchitectVersion: String by settings plugins { - id("refinedarchitect.root").version("0.16.4") - id("refinedarchitect.base").version("0.16.4") - id("refinedarchitect.common").version("0.16.4") - id("refinedarchitect.neoforge").version("0.16.4") - id("refinedarchitect.fabric").version("0.16.4") + id("refinedarchitect.root").version(refinedarchitectVersion) + id("refinedarchitect.base").version(refinedarchitectVersion) + id("refinedarchitect.common").version(refinedarchitectVersion) + id("refinedarchitect.neoforge").version(refinedarchitectVersion) + id("refinedarchitect.fabric").version(refinedarchitectVersion) } }