From fe13ce212e4f3eb2f794867edf4ce1ab3293814d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 14 May 2018 11:22:50 +0100 Subject: [PATCH] Fix build --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- src/main/java/net/fabricmc/loom/AbstractPlugin.java | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7f3e249..c56db12 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ dependencies { //Always fun when your dep needs the tool to build, but the tool needs the dep. //compile 'net.fabricmc:fabric-base:16w38a-0.0.4-SNAPSHOT' - shade('org.spongepowered:mixin:0.6.8-SNAPSHOT') { + shade('org.spongepowered:mixin:0.7.8-SNAPSHOT') { exclude module: 'launchwrapper' exclude module: 'guava' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16d2805..1f47535 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon May 14 11:21:37 BST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index b4c99b2..6ea6fbc 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -39,6 +39,7 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.SourceSet; +import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.javadoc.Javadoc; import org.gradle.plugins.ide.eclipse.model.EclipseModel; import org.gradle.plugins.ide.idea.model.IdeaModel; @@ -47,6 +48,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import java.util.Map; +import java.util.Set; public class AbstractPlugin implements Plugin { protected Project project;