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

Remove multi project optimisation (#1159)

Browse Source 
* Remove multi project optimisation

* Fix build

* Fix FAPI test
This commit is contained in:
modmuss
2024-08-14 10:59:18 +01:00
committed by GitHub
parent 5f52e1232f
commit b533dacba8
11 changed files with 5 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,10 +117,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
getUseMixinAP().set(LoomGradleExtension.get(getProject()).getMixin().getUseLegacyMixinAp());
if (getLoomExtension().multiProjectOptimisation()) {
setupPreparationTask();
}
// Make outputs reproducible by default
setReproducibleFileOrder(true);
setPreserveFileTimestamps(false);
@@ -128,19 +124,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
getJarType().set("classes");
}
private void setupPreparationTask() {
PrepareJarRemapTask prepareJarTask = getProject().getTasks().create("prepare" + getName().substring(0, 1).toUpperCase() + getName().substring(1), PrepareJarRemapTask.class, this);
dependsOn(prepareJarTask);
mustRunAfter(prepareJarTask);
getProject().getGradle().allprojects(project -> {
project.getTasks()
.withType(PrepareJarRemapTask.class)
.configureEach(this::mustRunAfter);
});
}
@TaskAction
public void run() {
submitWork(RemapAction.class, params -> {
@@ -152,8 +135,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getTinyRemapperService()));
params.getRemapClasspath().from(getClasspath());
params.getMultiProjectOptimisation().set(getLoomExtension().multiProjectOptimisation());
final boolean mixinAp = getUseMixinAP().get();
params.getUseMixinExtension().set(!mixinAp);
@@ -209,7 +190,6 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
ConfigurableFileCollection getRemapClasspath();
Property<Boolean> getUseMixinExtension();
Property<Boolean> getMultiProjectOptimisation();
Property<Boolean> getOptimizeFmj();
record RefmapData(List<String> mixinConfigs, String refmapName) implements Serializable { }
@@ -235,9 +215,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
try {
LOGGER.info("Remapping {} to {}", inputFile, outputFile);
if (!getParameters().getMultiProjectOptimisation().getOrElse(false)) {
prepare();
}
prepare();
if (tinyRemapperService != null) {
tinyRemapper = tinyRemapperService.getTinyRemapperForRemapping();
@@ -261,7 +239,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
optimizeFMJ();
}
if (tinyRemapperService != null && !getParameters().getMultiProjectOptimisation().get()) {
if (tinyRemapperService != null) {
tinyRemapperService.close();
}
@@ -281,7 +259,7 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
final Path inputFile = getParameters().getInputFile().getAsFile().get().toPath();
if (tinyRemapperService != null) {
PrepareJarRemapTask.prepare(tinyRemapperService, inputFile);
tinyRemapperService.getTinyRemapperForInputs().readInputsAsync(tinyRemapperService.getOrCreateTag(inputFile), inputFile);
}
}