imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FabricMC/dev/1.13' into dev/1.13

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
This commit is contained in:
shedaniel
2026-03-21 01:14:58 +09:00
parent 85507b8de9 d0fc6a5f5f
commit 0ab7b1bf56
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
View File

@@ -59,6 +59,7 @@ import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging; import org.gradle.api.logging.Logging;
import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.AbstractCopyTask; import org.gradle.api.tasks.AbstractCopyTask;
import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskContainer; import org.gradle.api.tasks.TaskContainer;
@@ -368,7 +369,10 @@ public abstract class CompileConfiguration implements Runnable {
} }
getProject().getTasks().named(JavaPlugin.TEST_TASK_NAME, Test.class, test -> { getProject().getTasks().named(JavaPlugin.TEST_TASK_NAME, Test.class, test -> {
test.getInputs().property("LoomClassPathGroups", ClasspathGroupService.create(getProject())); Provider<ClasspathGroupService.Options> optionsProvider = ClasspathGroupService.create(getProject());
test.getInputs().property("LoomClassPathGroups", optionsProvider);
test.getInputs().files(optionsProvider.map((ClasspathGroupService.Options::getExternalClasspathGroups)));
test.doFirst(new Action<Task>() { test.doFirst(new Action<Task>() {
@Override @Override
public void execute(Task task) { public void execute(Task task) {

4
src/main/java/net/fabricmc/loom/task/LoomTasks.java
View File

@@ -237,9 +237,9 @@ public abstract class LoomTasks implements Runnable {
task.setGroup(Constants.TaskGroup.FABRIC); task.setGroup(Constants.TaskGroup.FABRIC);
if (operatingSystem.isWindows()) { if (operatingSystem.isWindows()) {
task.from(getProject().zipTree(downloadRenderDoc.map(DownloadTask::getOutput))); task.from(getProject().zipTree(downloadRenderDoc.flatMap(DownloadTask::getOutput)));
} else { } else {
task.from(getProject().tarTree(downloadRenderDoc.map(DownloadTask::getOutput))); task.from(getProject().tarTree(downloadRenderDoc.flatMap(DownloadTask::getOutput)));
} }
task.into(getProject().getLayout().getBuildDirectory().dir("renderdoc")); task.into(getProject().getLayout().getBuildDirectory().dir("renderdoc"));