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

apply nested JAR dependencies to every remapJar task which nests

Browse source
This commit is contained in:
Adrian Siekierka 2019-04-22 01:25:03 +02:00
parent 7c25b0399c
commit 3094d70731
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -34,7 +34,7 @@ dependencies {
implementation ('org.zeroturnaround:zt-zip:1.13') implementation ('org.zeroturnaround:zt-zip:1.13')
implementation ('com.google.code.gson:gson:2.8.5') implementation ('com.google.code.gson:gson:2.8.5')
implementation ('com.google.guava:guava:27.1-jre') implementation ('com.google.guava:guava:27.1-jre')
implementation ('net.fabricmc:stitch:0.1.2.49') { implementation ('net.fabricmc:stitch:0.1.2.50') {
exclude module: 'enigma' exclude module: 'enigma'
} }
implementation ('net.fabricmc:tiny-remapper:0.1.0.33') { implementation ('net.fabricmc:tiny-remapper:0.1.0.33') {
@ -42,7 +42,7 @@ dependencies {
} }
implementation ('org.jetbrains:intellij-fernflower:1.0.0.8') implementation ('org.jetbrains:intellij-fernflower:1.0.0.8')
implementation ('net.fabricmc:sponge-mixin:0.7.11.22') { implementation ('net.fabricmc:sponge-mixin:0.7.11.23') {
exclude module: 'launchwrapper' exclude module: 'launchwrapper'
exclude module: 'guava' exclude module: 'guava'
} }

13
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View file

@ -267,8 +267,17 @@ public class AbstractPlugin implements Plugin<Project> {
remapJarTask.doLast(task -> project1.getArtifacts().add("archives", remapJarTask.jar)); remapJarTask.doLast(task -> project1.getArtifacts().add("archives", remapJarTask.jar));
remapJarTask.dependsOn(project1.getTasks().getByName("jar")); remapJarTask.dependsOn(project1.getTasks().getByName("jar"));
project1.getTasks().getByName("build").dependsOn(remapJarTask); project1.getTasks().getByName("build").dependsOn(remapJarTask);
//Run all the sub project remap jars tasks before the root projects jar, this is to allow us to include projects
NestedJars.getRequiredTasks(project1).forEach(remapJarTask::dependsOn); Map<Project, Set<Task>> taskMap = project.getAllTasks(true);
for (Map.Entry<Project, Set<Task>> entry : taskMap.entrySet()) {
Set<Task> taskSet = entry.getValue();
for (Task task : taskSet) {
if (task instanceof RemapJar && ((RemapJar) task).isNestJar()) {
//Run all the sub project remap jars tasks before the root projects jar, this is to allow us to include projects
NestedJars.getRequiredTasks(project1).forEach(task::dependsOn);
}
}
}
try { try {
AbstractArchiveTask sourcesTask = (AbstractArchiveTask) project1.getTasks().getByName("sourcesJar"); AbstractArchiveTask sourcesTask = (AbstractArchiveTask) project1.getTasks().getByName("sourcesJar");