fix: Fix broken publishing

This commit is contained in:
2025-11-08 02:08:39 +01:00
parent 0ee706876e
commit 1a07d35136
4 changed files with 29 additions and 22 deletions

View File

@@ -1,14 +1,11 @@
import org.gradle.api.publish.internal.PublicationInternal
plugins { plugins {
`maven-publish` `maven-publish`
id("de.siphalor.tweed5.publishing") id("de.siphalor.tweed5.publishing")
id("de.siphalor.tweed5.minecraft.mod.base") id("de.siphalor.tweed5.minecraft.mod.base")
} }
configurations.minecraftModApiElements {
extendsFrom(configurations.implementation.get())
exclude("commons-logging", "commons-logging")
}
val minecraftModJar = tasks.register<Jar>("minecraftModJar") { val minecraftModJar = tasks.register<Jar>("minecraftModJar") {
group = LifecycleBasePlugin.BUILD_GROUP group = LifecycleBasePlugin.BUILD_GROUP
@@ -57,3 +54,13 @@ publishing {
} }
} }
// Required because the maven publish plugin only supports one publication per project dependency
// to be able to resolve the dependency's coordinates.
// Luckily, this is fine in our case, as the Minecraft mod jars should publish each other as dependencies
// anyway. With proper dependencies in place, missing dependencies tend to become an unexpected runtime
// error in Minecraft modding.
afterEvaluate {
if (publishing.publications.names.size > 1) {
(publishing.publications.findByName("minecraftMod") as? PublicationInternal<*>)?.isAlias = true
}
}

View File

@@ -2,17 +2,13 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.bundle") id("de.siphalor.tweed5.minecraft.mod.bundle")
} }
configurations.minecraftJijElements {
isTransitive = false
}
dependencies { dependencies {
minecraftJij("de.siphalor.tweed5:tweed5-annotation-inheritance") minecraftJij("de.siphalor.tweed5:tweed5-annotation-inheritance:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-naming-format") minecraftJij("de.siphalor.tweed5:tweed5-naming-format:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-type-utils") minecraftJij("de.siphalor.tweed5:tweed5-type-utils:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo") minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-attributes-extension") minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-attributes-extension:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-presets-extension") minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-presets-extension:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-serde-extension") minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-serde-extension:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-validation-extension") minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-validation-extension:${project.version}")
} }

View File

@@ -3,9 +3,13 @@ plugins {
} }
dependencies { dependencies {
minecraftJij("de.siphalor.tweed5:tweed5-core") minecraftJij("de.siphalor.tweed5:tweed5-attributes-extension:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-attributes-extension") minecraftJij("de.siphalor.tweed5:tweed5-construct:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-default-extensions") minecraftJij("de.siphalor.tweed5:tweed5-core:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-serde-extension") minecraftJij("de.siphalor.tweed5:tweed5-default-extensions:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-patchwork:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-serde-api:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-serde-extension:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-utils:${project.version}")
minecraftJij(project(":tweed5-logging")) minecraftJij(project(":tweed5-logging"))
} }

View File

@@ -1 +1 @@
minecraft.version.descriptor = 1.21.10 minecraft.version.descriptor = 1.17.1