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

GenerateSourcesTask: Use ScopedSharedServiceManager like upstream code

Browse Source
This commit is contained in:
Juuz
2023-02-18 02:37:28 +02:00
parent f34be9d221
commit 7fece953a4
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
View File

@@ -49,12 +49,10 @@ import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.file.FileCollection;
import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.provider.Property;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.TaskAction;
import org.gradle.build.event.BuildEventsListenerRegistry;
import org.gradle.work.DisableCachingByDefault;
import org.gradle.workers.WorkAction;
import org.gradle.workers.WorkParameters;
@@ -83,7 +81,6 @@ import net.fabricmc.loom.util.gradle.ThreadedSimpleProgressLogger;
import net.fabricmc.loom.util.gradle.WorkerDaemonClientsManagerHelper;
import net.fabricmc.loom.util.ipc.IPCClient;
import net.fabricmc.loom.util.ipc.IPCServer;
import net.fabricmc.loom.util.service.BuildSharedServiceManager;
import net.fabricmc.loom.util.service.ScopedSharedServiceManager;
import net.fabricmc.mappingio.MappingReader;
import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch;
@@ -118,11 +115,6 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
@Inject
public abstract WorkerDaemonClientsManager getWorkerDaemonClientsManager();
@Inject
protected abstract BuildEventsListenerRegistry getBuildEventsListenerRegistry();
private final Provider<BuildSharedServiceManager> serviceManagerProvider;
@Inject
public GenerateSourcesTask(DecompilerOptions decompilerOptions) {
this.decompilerOptions = decompilerOptions;
@@ -132,8 +124,6 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
dependsOn(decompilerOptions.getClasspath().getBuiltBy());
getOutputJar().fileProvider(getProject().provider(() -> getMappedJarFileWithSuffix("-sources.jar")));
serviceManagerProvider = BuildSharedServiceManager.createForTask(this, getBuildEventsListenerRegistry());
}
@TaskAction
@@ -164,7 +154,9 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
// Inject Forge's own sources
if (getExtension().isForge()) {
ForgeSourcesRemapper.addForgeSources(getProject(), serviceManagerProvider.get().get(), getOutputJar().get().getAsFile().toPath());
try (var serviceManager = new ScopedSharedServiceManager()) {
ForgeSourcesRemapper.addForgeSources(getProject(), serviceManager, getOutputJar().get().getAsFile().toPath());
}
}
}