From e1cda212bd053da4299fbb8ed4312dbe2832a7f9 Mon Sep 17 00:00:00 2001 From: Finn Rades <64548817+zOnlyKroks@users.noreply.github.com> Date: Sat, 8 Nov 2025 23:39:19 +0100 Subject: [PATCH 1/3] Fix failing renderDoc extract (#1434) --- src/main/java/net/fabricmc/loom/task/LoomTasks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/LoomTasks.java b/src/main/java/net/fabricmc/loom/task/LoomTasks.java index 312d558d..94778cf8 100644 --- a/src/main/java/net/fabricmc/loom/task/LoomTasks.java +++ b/src/main/java/net/fabricmc/loom/task/LoomTasks.java @@ -237,9 +237,9 @@ public abstract class LoomTasks implements Runnable { task.setGroup(Constants.TaskGroup.FABRIC); if (operatingSystem.isWindows()) { - task.from(getProject().zipTree(downloadRenderDoc.map(DownloadTask::getOutput))); + task.from(getProject().zipTree(downloadRenderDoc.flatMap(DownloadTask::getOutput))); } else { - task.from(getProject().tarTree(downloadRenderDoc.map(DownloadTask::getOutput))); + task.from(getProject().tarTree(downloadRenderDoc.flatMap(DownloadTask::getOutput))); } task.into(getProject().getLayout().getBuildDirectory().dir("renderdoc")); From 98f4a741274a077bfb102199c2bb09846c200f66 Mon Sep 17 00:00:00 2001 From: modmuss Date: Fri, 21 Nov 2025 20:39:21 +0000 Subject: [PATCH 2/3] Add external classpath groups as explicit test task inputs. (#1453) --- .../fabricmc/loom/configuration/CompileConfiguration.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index fe8a640a..df78bce5 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -45,6 +45,7 @@ import org.gradle.api.Task; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.provider.Provider; import org.gradle.api.tasks.AbstractCopyTask; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.TaskContainer; @@ -55,6 +56,7 @@ import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.InterfaceInjectionExtensionAPI; +import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.build.mixin.GroovyApInvoker; import net.fabricmc.loom.build.mixin.JavaApInvoker; import net.fabricmc.loom.build.mixin.KaptApInvoker; @@ -271,7 +273,10 @@ public abstract class CompileConfiguration implements Runnable { } getProject().getTasks().named(JavaPlugin.TEST_TASK_NAME, Test.class, test -> { - test.getInputs().property("LoomClassPathGroups", ClasspathGroupService.create(getProject())); + Provider optionsProvider = ClasspathGroupService.create(getProject()); + test.getInputs().property("LoomClassPathGroups", optionsProvider); + test.getInputs().files(optionsProvider.map((ClasspathGroupService.Options::getExternalClasspathGroups))); + test.doFirst(new Action() { @Override public void execute(Task task) { From d0fc6a5f5f84fc284775fa5033041d552ee78732 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 22 Nov 2025 20:22:26 +0000 Subject: [PATCH 3/3] Fix bad cherry-pick --- .../net/fabricmc/loom/configuration/CompileConfiguration.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index df78bce5..489bd3c4 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -56,7 +56,6 @@ import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.InterfaceInjectionExtensionAPI; -import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.build.mixin.GroovyApInvoker; import net.fabricmc.loom.build.mixin.JavaApInvoker; import net.fabricmc.loom.build.mixin.KaptApInvoker;