hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make DecompilerOptions.getClasspath() an input for GenerateSourcesTask

Browse source
This commit is contained in:
modmuss50 2022-01-23 14:53:07 +00:00
parent b69404ea03
commit a598625146
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
View file

@ -45,6 +45,7 @@ import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.file.RegularFileProperty; import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.provider.Property; import org.gradle.api.provider.Property;
import org.gradle.api.tasks.InputFile; import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import org.gradle.workers.WorkAction; import org.gradle.workers.WorkAction;
import org.gradle.workers.WorkParameters; import org.gradle.workers.WorkParameters;
@ -84,6 +85,9 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
@InputFile @InputFile
public abstract RegularFileProperty getRuntimeJar(); public abstract RegularFileProperty getRuntimeJar();
@InputFiles
public abstract ConfigurableFileCollection getClasspath();
@Inject @Inject
public abstract WorkerExecutor getWorkerExecutor(); public abstract WorkerExecutor getWorkerExecutor();
@ -95,6 +99,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
this.decompilerOptions = decompilerOptions; this.decompilerOptions = decompilerOptions;
getOutputs().upToDateWhen((o) -> false); getOutputs().upToDateWhen((o) -> false);
getClasspath().from(decompilerOptions.getClasspath()).finalizeValueOnRead();
} }
@TaskAction @TaskAction
@ -161,7 +166,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
private WorkQueue createWorkQueue(String jvmMarkerValue) { private WorkQueue createWorkQueue(String jvmMarkerValue) {
if (!useProcessIsolation()) { if (!useProcessIsolation()) {
return getWorkerExecutor().classLoaderIsolation(spec -> { return getWorkerExecutor().classLoaderIsolation(spec -> {
spec.getClasspath().from(decompilerOptions.getClasspath()); spec.getClasspath().from(getClasspath());
}); });
} }
@ -170,7 +175,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
forkOptions.setMaxHeapSize("%dm".formatted(decompilerOptions.getMemory().get())); forkOptions.setMaxHeapSize("%dm".formatted(decompilerOptions.getMemory().get()));
forkOptions.systemProperty(WorkerDaemonClientsManagerHelper.MARKER_PROP, jvmMarkerValue); forkOptions.systemProperty(WorkerDaemonClientsManagerHelper.MARKER_PROP, jvmMarkerValue);
}); });
spec.getClasspath().from(decompilerOptions.getClasspath()); spec.getClasspath().from(getClasspath());
}); });
} }