From d58cdd0d88610f4c36c714940029639c47550f65 Mon Sep 17 00:00:00 2001 From: claude Date: Mon, 18 May 2026 12:19:39 +0000 Subject: [PATCH] build: target latest Minestom, align Butterfly, harden shaded jar, pin CI - Pin net.minestom:minestom to 2026.05.17-1.21.11 (current Maven Central release) instead of the BOM-resolved version so the deployable jar runs on the latest Minestom regardless of aonyx/mycelium BOM lag. - Bump butterfly 1.0.21 -> 1.0.23 to match the current Butterfly release. - Harden the application shadowJar: strip jar signatures and module-info and exclude duplicates so the relocation-free fat jar built from the shaded LuckPerms fork stays loadable. - Pin the reusable PR/publish workflows to the v2.1.0 release tag instead of a temporary branch ref. https://claude.ai/code/session_01S76fk9ma5Szkf9r1W44RVP --- .github/workflows/build-pr.yml | 2 +- .github/workflows/publish.yaml | 2 +- app/build.gradle.kts | 5 +++++ settings.gradle.kts | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 7326072..007d472 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -3,5 +3,5 @@ on: [pull_request] jobs: build: - uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-build-pr.yml@claude/implement-release-please-9inVJ + uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-build-pr.yml@v2.1.0 secrets: inherit diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 6bc704d..8cfb25c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -5,5 +5,5 @@ on: jobs: publish: - uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-publish.yml@v2.0.0 + uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-publish.yml@v2.1.0 secrets: inherit diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c234cdc..b95c6c5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -61,6 +61,11 @@ tasks { archiveClassifier.set("") archiveFileName.set("app-titan.jar") mergeServiceFiles() + // LuckPerms `common` pulls signed and multi-release jars that break a + // relocation-free application fat jar; drop signatures and module-info. + exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA") + exclude("module-info.class", "META-INF/versions/**/module-info.class") + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } test { useJUnitPlatform() diff --git a/settings.gradle.kts b/settings.gradle.kts index 0440b26..a979074 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,7 @@ dependencyResolutionManagement { version("aonyx-bom", "0.7.1") version("mycelium-bom", "1.6.4") version("cloudnet", "4.0.0-RC17-SNAPSHOT") - version("butterfly", "1.0.21") + version("butterfly", "1.0.23") version("luckperms", "5.6-SNAPSHOT") @@ -43,7 +43,7 @@ dependencyResolutionManagement { // Minestom library("aonyx-bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx-bom") library("mycelium-bom", "net.onelitefeather", "mycelium-bom").versionRef("mycelium-bom") - library("minestom","net.minestom", "minestom").withoutVersion() + library("minestom","net.minestom", "minestom").version("2026.05.17-1.21.11") library("aves", "net.theevilreaper", "aves").version("1.9.0") library("adventure.minimessage", "net.kyori", "adventure-text-minimessage").withoutVersion() library("butterfly-minestom", "net.onelitefeather", "butterfly-minestom").versionRef("butterfly")