From 4e61db80aff180001031f5a500d27f7ea7b99898 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 8 Jul 2024 22:36:39 +0200 Subject: [PATCH] chore: upgrade refined architect --- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../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 +- .../workflows/validate-commit-messages.yml | 2 +- build.gradle | 5 -- build.gradle.kts | 11 ++++ .../build.gradle | 15 +++++- .../build.gradle | 3 -- .../build.gradle.kts | 18 +++++++ .../build.gradle | 3 -- .../build.gradle.kts | 18 +++++++ settings.gradle | 23 --------- settings.gradle.kts | 50 +++++++++++++++++++ 17 files changed, 118 insertions(+), 44 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 refinedarchitect-template-platform-fabric/build.gradle create mode 100644 refinedarchitect-template-platform-fabric/build.gradle.kts delete mode 100644 refinedarchitect-template-platform-neoforge/build.gradle create mode 100644 refinedarchitect-template-platform-neoforge/build.gradle.kts delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a120cf..33b88ff 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.15.3 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.2 with: mutation-testing: false sonarqube: false diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index f066a48..654a116 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.15.3 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.2 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 fbe9339..adf506e 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.15.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.2 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 4638113..f9b1609 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.15.3 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.2 secrets: inherit with: project-name: 'Refined Architect template' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index d81c8f6..0ef64ca 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.15.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.2 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 3786119..8cc3e40 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.15.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.2 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 37f4d77..baac7e0 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.15.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.2 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index cc3220c..30ba6a8 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.15.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.2 \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 5241831..0000000 --- a/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v${gradle.ext.refinedArchitectVersion}/helper.gradle" - -subprojects { - group = 'com.refinedmods.refinedarchitect-template' -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6027c34 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("refinedarchitect.root") +} + +refinedarchitect { + // sonarQube("refinedmods_XXX", "refinedmods") +} + +subprojects { + group = "com.refinedmods.refinedarchitect-template" +} diff --git a/refinedarchitect-template-platform-common/build.gradle b/refinedarchitect-template-platform-common/build.gradle index 83cb5c7..aa83352 100644 --- a/refinedarchitect-template-platform-common/build.gradle +++ b/refinedarchitect-template-platform-common/build.gradle @@ -1,3 +1,14 @@ -archivesBaseName = 'refinedarchitect-template-platform-common' +plugins { + id("refinedarchitect.common") +} -commonProject() \ No newline at end of file +refinedarchitect { + common() + publishing { + // maven = false + } +} + +base { + archivesName.set("refinedarchitect-template-platform-common") +} diff --git a/refinedarchitect-template-platform-fabric/build.gradle b/refinedarchitect-template-platform-fabric/build.gradle deleted file mode 100644 index 69a214b..0000000 --- a/refinedarchitect-template-platform-fabric/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -archivesBaseName = 'refinedarchitect-template-platform-fabric' - -fabricProject("refinedarchitecttemplate", project(":refinedarchitect-template-platform-common")) \ No newline at end of file diff --git a/refinedarchitect-template-platform-fabric/build.gradle.kts b/refinedarchitect-template-platform-fabric/build.gradle.kts new file mode 100644 index 0000000..2c33af1 --- /dev/null +++ b/refinedarchitect-template-platform-fabric/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("refinedarchitect.fabric") +} + +refinedarchitect { + modId = "refinedarchitecttemplate" + fabric() + compileWithProject(project(":refinedarchitect-template-platform-common")) + publishing { + // maven = true + // curseForge = "123" + // modrinth = "slug" + } +} + +base { + archivesName.set("refinedarchitect-template-neoforge") +} diff --git a/refinedarchitect-template-platform-neoforge/build.gradle b/refinedarchitect-template-platform-neoforge/build.gradle deleted file mode 100644 index 2f068af..0000000 --- a/refinedarchitect-template-platform-neoforge/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -archivesBaseName = 'refinedarchitect-template-platform-neoforge' - -neoForgeProject("refinedarchitecttemplate", project(":refinedarchitect-template-platform-common")) \ No newline at end of file diff --git a/refinedarchitect-template-platform-neoforge/build.gradle.kts b/refinedarchitect-template-platform-neoforge/build.gradle.kts new file mode 100644 index 0000000..0256661 --- /dev/null +++ b/refinedarchitect-template-platform-neoforge/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("refinedarchitect.neoforge") +} + +refinedarchitect { + modId = "refinedarchitecttemplate" + neoForge() + compileWithProject(project(":refinedarchitect-template-platform-common")) + publishing { + // maven = true + // curseForge = "123" + // modrinth = "slug" + } +} + +base { + archivesName.set("refinedarchitect-template-neoforge") +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index c70b74c..0000000 --- a/settings.gradle +++ /dev/null @@ -1,23 +0,0 @@ -gradle.ext.refinedArchitectVersion = "0.15.3" - -dependencyResolutionManagement { - repositories { - maven { - url = "https://maven.pkg.github.com/refinedmods/refinedarchitect" - credentials { - username = "anything" - password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" - } - } - } - versionCatalogs { - create("libs") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog:${gradle.ext.refinedArchitectVersion}") - } - } -} - -rootProject.name = 'refinedarchitect-template' -include 'refinedarchitect-template-platform-common' -include 'refinedarchitect-template-platform-neoforge' -include 'refinedarchitect-template-platform-fabric' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..4594ba5 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,50 @@ +dependencyResolutionManagement { + repositories { + maven { + url = uri("https://maven.pkg.github.com/refinedmods/refinedarchitect") + credentials { + username = "anything" + password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" + } + } + } + versionCatalogs { + create("libs") { + from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:0.16.2") + } + } +} + +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven { + url = uri("https://maven.pkg.github.com/refinedmods/refinedarchitect") + credentials { + username = "anything" + password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" + } + } + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } + maven { + name = "NeoForge" + url = uri("https://maven.neoforged.net/releases") + } + } + plugins { + id("refinedarchitect.root").version("0.16.2") + id("refinedarchitect.base").version("0.16.2") + id("refinedarchitect.common").version("0.16.2") + id("refinedarchitect.neoforge").version("0.16.2") + id("refinedarchitect.fabric").version("0.16.2") + } +} + +rootProject.name = "refinedarchitect-template" +include("refinedarchitect-template-platform-common") +include("refinedarchitect-template-platform-neoforge") +include("refinedarchitect-template-platform-fabric")