From e96c0e2fbdf4e45d12e7063617ac7fe26ae5832a Mon Sep 17 00:00:00 2001 From: modmuss Date: Mon, 1 Apr 2024 21:13:50 +0100 Subject: [PATCH] Fix remapped sources publishing (#1084) --- .../net/fabricmc/loom/task/RemapTaskConfiguration.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java index d138779c..f38fed6d 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java +++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java @@ -163,11 +163,14 @@ public abstract class RemapTaskConfiguration implements Runnable { } if (getConfigurations().getNames().contains(JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME)) { - getArtifacts().add(JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME, remapSourcesTask); - // Remove the dev sources artifact Configuration configuration = getConfigurations().getByName(JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME); - configuration.getArtifacts().removeIf(a -> a.getFile().equals(sourcesJarTask.getArchiveFile().get().getAsFile())); + configuration.getArtifacts().removeIf(a -> "sources".equals(a.getClassifier())); + + // Add the remapped sources artifact + getArtifacts().add(JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME, remapSourcesTask.map(AbstractArchiveTask::getArchiveFile), artifact -> { + artifact.setClassifier("sources"); + }); } else { // Sources jar may not have been created with withSourcesJar getProject().getLogger().warn("Not publishing sources jar as it was not found. Use java.withSourcesJar() to fix.");