From 5488715ec177b71479b015ff6dad9662683983ee Mon Sep 17 00:00:00 2001 From: Siphalor Date: Fri, 19 Dec 2025 21:14:26 +0100 Subject: [PATCH] build(logging): Fix broken build because of broken sources jar --- ...iphalor.tweed5.minecraft.mod.dummy.gradle.kts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts index 0654160..e398e56 100644 --- a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts +++ b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts @@ -24,13 +24,7 @@ tasks.assemble { val minecraftModSourcesJar = tasks.register("minecraftModSourcesJar") { group = LifecycleBasePlugin.BUILD_GROUP - dependsOn(tasks.named("sourcesJar")) dependsOn(tasks.named("processMinecraftModResources")) - - val sourcesJar = objects.fileCollection().from(tasks.named("sourcesJar").map { it.archiveFile }) - inputs.files(sourcesJar) - - from(sourcesJar.map { zipTree(it) }) from(project.layout.buildDirectory.dir("minecraftModResources")) archiveClassifier = "sources" @@ -40,8 +34,16 @@ val minecraftModSourcesJar = tasks.register("minecraftModSourcesJar") { artifacts.add("minecraftModElements", minecraftModJar) artifacts.add("minecraftModApiElements", minecraftModJar) afterEvaluate { - if (tasks.findByName("sourcesJar") != null) { + tasks.findByName("sourcesJar")?.let { sourcesJar -> artifacts.add("minecraftModSourcesElements", minecraftModSourcesJar) + + minecraftModSourcesJar.configure { + val sourcesJar = sourcesJar as Jar + dependsOn(sourcesJar) + val sourcesJarArtifact = objects.fileCollection().from(sourcesJar.archiveFile) + inputs.files(sourcesJarArtifact) + from(files(sourcesJarArtifact).map { zipTree(it) }) + } } }