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

Gradle 8 tests, perf/memory optimisations (#796)

Browse Source 
* Add gradle 8 tests
Reuse gradle home between tests
Misc perf and mem optimisations

* Fix build warning.

* Added multi mc version test

* Use server launcher in ServerRunner

Co-authored-by: Luna <62033805+Luna5ama@users.noreply.github.com>
This commit is contained in:
modmuss50
2023-01-16 18:39:26 +00:00
committed by GitHub
parent 0c68994aa6
commit 63ecb88082
23 changed files with 339 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View File

@@ -33,13 +33,11 @@ import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Inject;
import com.google.common.base.Suppliers;
import com.google.gson.JsonObject;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.file.ConfigurableFileCollection;
@@ -90,13 +88,11 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
public abstract Property<Boolean> getUseMixinAP();
private final Provider<BuildSharedServiceManager> serviceManagerProvider;
private final Supplier<TinyRemapperService> tinyRemapperService;
@Inject
public RemapJarTask() {
super();
serviceManagerProvider = BuildSharedServiceManager.createForTask(this, getBuildEventsListenerRegistry());
tinyRemapperService = Suppliers.memoize(() -> TinyRemapperService.getOrCreate(serviceManagerProvider.get().get(), this));
getClasspath().from(getProject().getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
getAddNestedDependencies().convention(true).finalizeValueOnRead();
@@ -134,7 +130,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
params.getNestedJars().from(getNestedJars());
}
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(tinyRemapperService.get()));
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getTinyRemapperService()));
params.getRemapClasspath().from(getClasspath());
params.getMultiProjectOptimisation().set(getLoomExtension().multiProjectOptimisation());
@@ -337,6 +333,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
@Internal
public TinyRemapperService getTinyRemapperService() {
return tinyRemapperService.get();
return TinyRemapperService.getOrCreate(serviceManagerProvider.get().get(), this);
}
}