From 6662942c423122d31de1940c3071ca6e5b1ed305 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Mon, 15 Dec 2025 20:00:25 +0100 Subject: [PATCH] fix(minecraft): Fix publishing of shadow relocation --- gradle/libs.versions.toml | 2 +- tweed5-minecraft/buildSrc/build.gradle.kts | 1 + ...halor.tweed5.minecraft.mod.cross-version.gradle.kts | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 537c3ad..28da147 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ junit = "5.12.0" lombok = "1.18.38" logback = "1.5.18" mockito = "5.14.2" -shadow = "9.0.0-rc2" +shadow = "9.3.0" slf4j = "2.0.16" [plugins] diff --git a/tweed5-minecraft/buildSrc/build.gradle.kts b/tweed5-minecraft/buildSrc/build.gradle.kts index 5c3a719..bcc2d88 100644 --- a/tweed5-minecraft/buildSrc/build.gradle.kts +++ b/tweed5-minecraft/buildSrc/build.gradle.kts @@ -10,4 +10,5 @@ dependencies { implementation(pluginMarker(mcCommonLibs.plugins.fabric.loom)) implementation(pluginMarker(mcCommonLibs.plugins.jcyo)) implementation(pluginMarker(libs.plugins.lombok)) + implementation(pluginMarker(libs.plugins.shadow)) } diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts index 14535a5..8307ca0 100644 --- a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts +++ b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts @@ -11,6 +11,7 @@ plugins { id("de.siphalor.tweed5.expanded-sources-jar") id("de.siphalor.jcyo") id("io.freefair.lombok") + id("com.gradleup.shadow") id("de.siphalor.tweed5.shadow.explicit") id("de.siphalor.tweed5.minecraft.mod.base") } @@ -154,6 +155,15 @@ tasks.named("processTestmodResources") { duplicatesStrategy = DuplicatesStrategy.EXCLUDE } +shadow { + addShadowVariantIntoJavaComponent = false +} + +tasks.remapJar { + dependsOn(tasks.shadowJar) + inputFile = tasks.shadowJar.get().archiveFile +} + fun getMcCatalogVersion(name: String): String { return mcCatalog.findVersion(name).get().requiredVersion }