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

Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future

Browse Source 
# Conflicts:
#	bootstrap/test-project/build.gradle
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
This commit is contained in:
shedaniel
2021-08-14 14:46:18 +08:00
parent 57d5d20816 a0c2d877af
commit 6d9065eb1e
15 changed files with 235 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
View File

@@ -147,10 +147,10 @@ public class RemapConfiguration {
RemapSourcesJarTask remapSourcesJarTask = (RemapSourcesJarTask) project.getTasks().findByName(remapSourcesJarTaskName);
Preconditions.checkNotNull(remapSourcesJarTask, "Could not find " + remapSourcesJarTaskName + " in " + project.getName());
remapSourcesJarTask.setOutput(sourcesTask.getArchivePath());
remapSourcesJarTask.getOutput().set(sourcesTask.getArchiveFile());
String sourcesTaskClassifer = sourcesTask.getArchiveClassifier().get();
sourcesTask.getArchiveClassifier().set(sourcesTaskClassifer == null ? "dev" : sourcesTaskClassifer + "-dev");
remapSourcesJarTask.setInput(sourcesTask.getArchivePath());
remapSourcesJarTask.getInput().set(sourcesTask.getArchiveFile());
remapSourcesJarTask.dependsOn(sourcesTask);
if (isDefaultRemap) {