From 0d2c97bf510dcf079733dedba7ffc11a2979f694 Mon Sep 17 00:00:00 2001
From: Adrian Siekierka <kontakt@asie.pl>
Date: Wed, 31 Oct 2018 18:18:42 +0100
Subject: [PATCH] move JAR merging to Stitch

---
 build.gradle                                            | 5 ++++-
 src/main/java/net/fabricmc/loom/task/MergeJarsTask.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 29b1eafe..999a819d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,10 @@ dependencies {
     shade 'commons-io:commons-io:2.6'
     shade 'org.apache.commons:commons-lang3:3.8.1'
     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
     }
     shade ('cuchaz:enigma:0.12.0.+:lib'){
diff --git a/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java b/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
index 13ff88bf..6aef4810 100644
--- a/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
+++ b/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
@@ -26,7 +26,7 @@ package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.LoomGradleExtension;
 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.tasks.TaskAction;