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

move JAR merging to Stitch

dev/0.11
Adrian Siekierka 2018-10-31 18:18:42 +01:00
parent a99bee8f7c
commit 0d2c97bf51
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -50,7 +50,10 @@ dependencies {
shade 'commons-io:commons-io:2.6' shade 'commons-io:commons-io:2.6'
shade 'org.apache.commons:commons-lang3:3.8.1' shade 'org.apache.commons:commons-lang3:3.8.1'
shade 'com.google.guava:guava:27.0-jre' shade 'com.google.guava:guava:27.0-jre'
shade ('net.fabricmc:weave:+'){ shade ('net.fabricmc:weave:0.2.0.+'){
transitive = false
}
shade ('net.fabricmc:stitch:0.1.0.+'){
transitive = false transitive = false
} }
shade ('cuchaz:enigma:0.12.0.+:lib'){ shade ('cuchaz:enigma:0.12.0.+:lib'){

2
src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
View File

@ -26,7 +26,7 @@ package net.fabricmc.loom.task;
import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.Constants;
import net.fabricmc.weave.merge.JarMerger; import net.fabricmc.stitch.merge.JarMerger;
import org.gradle.api.DefaultTask; import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;