From a4e7ea7aceba13a05bce25bf990b01a25d1322e0 Mon Sep 17 00:00:00 2001 From: Anastasia Chrysanthemum Date: Mon, 2 Mar 2026 12:19:55 +1100 Subject: [PATCH] fix: Don't transitively apply dependencies from Polyamory. --- CHANGELOG.md | 1 + .../lgbt/greenhouse/config/gradle/Properties.kt | 2 +- fabric/build.gradle.kts | 12 +++++++++--- gradle/libs.versions.toml | 2 +- neoforge/build.gradle.kts | 12 +++++++++--- xplat/build.gradle.kts | 12 +++++++++--- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12f5f24..6059689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### Build Specific Changes +- Updated Polyamory: DataFixerUpper module to 0.1.5, fixing an issue where it pulls an unwanted version of DFU. #### Breaking API Changes diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt b/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt index 960920e..b4b74d2 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt @@ -1,7 +1,7 @@ package lgbt.greenhouse.config.gradle object Properties { - const val MOD_VERSION = "3.0.0-beta.1" + const val MOD_VERSION = "3.0.0-beta.2" const val JAVA_VERSION = 21 const val GROUP = "lgbt.greenhouse.config" diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 3dae8a7..dd4c687 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -27,12 +27,18 @@ dependencies { modCompileOnly(libs.mod.menu) modLocalRuntime(libs.mod.menu) - api(libs.polyamory) + api(libs.polyamory) { + isTransitive = false + } include(libs.polyamory) - api(libs.polyamory.dfu) + api(libs.polyamory.dfu) { + isTransitive = false + } include(libs.polyamory.dfu) - api(libs.polyamory.lang.jsonc) + api(libs.polyamory.lang.jsonc) { + isTransitive = false + } include(libs.polyamory.lang.jsonc) modApi(libs.yumi.mc.foundation) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0eae4a5..98f4a85 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ neoforge = "21.11.6-beta" # Dependencies polyamory = "0.1.1" -polyamory-dfu = "0.1.4" +polyamory-dfu = "0.1.5" polyamory-lang-jsonc = "0.1.2" yumi-mc-foundation = "1.0.0-beta.1+1.21.11" diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 7accc2e..f314a15 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -11,12 +11,18 @@ plugins { val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java) dependencies { - api(libs.polyamory) + api(libs.polyamory) { + isTransitive = false + } api(libs.polyamory.dfu) - jarJar(libs.polyamory) + jarJar(libs.polyamory) { + isTransitive = false + } jarJar(libs.polyamory.dfu) - api(libs.polyamory.lang.jsonc) + api(libs.polyamory.lang.jsonc) { + isTransitive = false + } jarJar(libs.polyamory.lang.jsonc) api(libs.yumi.mc.foundation) { diff --git a/xplat/build.gradle.kts b/xplat/build.gradle.kts index 78d0700..7db7ad0 100644 --- a/xplat/build.gradle.kts +++ b/xplat/build.gradle.kts @@ -75,9 +75,15 @@ dependencies { } } - api(libs.polyamory) - api(libs.polyamory.dfu) - api(libs.polyamory.lang.jsonc) + compileOnly(libs.polyamory) { + isTransitive = false + } + compileOnly(libs.polyamory.dfu) { + isTransitive = false + } + compileOnly(libs.polyamory.lang.jsonc) { + isTransitive = false + } } neoForge { -- 2.51.2