85 lines
4.1 KiB
Diff
85 lines
4.1 KiB
Diff
From 5d778fec168a72d41df672ad38ee5f01973916ce Mon Sep 17 00:00:00 2001
|
|
From: Jonas Herzig <me@johni0702.de>
|
|
Date: Sat, 2 Sep 2017 15:40:15 +0200
|
|
Subject: [PATCH] Fix compilation with newer gradle versions
|
|
|
|
---
|
|
src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java | 1 -
|
|
src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java | 1 -
|
|
src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java | 1 -
|
|
.../java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java | 4 ++--
|
|
src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java | 1 -
|
|
5 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
|
|
index 1de9ac3..8d0a5a5 100644
|
|
--- a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
|
|
+++ b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
|
|
@@ -128,7 +128,6 @@ public class CreateStartTask extends CachedTask
|
|
LoggingManager log = getLogging();
|
|
LogLevel startLevel = getProject().getGradle().getStartParameter().getLogLevel();
|
|
if (startLevel.compareTo(LogLevel.LIFECYCLE) >= 0) {
|
|
- log.setLevel(LogLevel.ERROR);
|
|
}
|
|
// INVOKE!
|
|
this.getAnt().invokeMethod("javac", ImmutableMap.builder()
|
|
diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
|
|
index 224292c..f61618c 100644
|
|
--- a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
|
|
+++ b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
|
|
@@ -86,7 +86,6 @@ public class TaskRecompileMc extends CachedTask
|
|
LoggingManager log = getLogging();
|
|
LogLevel startLevel = getProject().getGradle().getStartParameter().getLogLevel();
|
|
if (startLevel.compareTo(LogLevel.LIFECYCLE) >= 0) {
|
|
- log.setLevel(LogLevel.ERROR);
|
|
}
|
|
|
|
// recompile
|
|
diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
|
|
index 98391fc..9408a07 100644
|
|
--- a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
|
|
+++ b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
|
|
@@ -37,7 +37,6 @@ import javax.xml.transform.TransformerFactory;
|
|
import javax.xml.transform.dom.DOMSource;
|
|
import javax.xml.transform.stream.StreamResult;
|
|
|
|
-import com.beust.jcommander.internal.Lists;
|
|
import org.gradle.api.Action;
|
|
import org.gradle.api.DefaultTask;
|
|
import org.gradle.api.NamedDomainObjectContainer;
|
|
diff --git a/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java b/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java
|
|
index 4e9dbe5..4f3744e 100644
|
|
--- a/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java
|
|
+++ b/src/main/java/net/minecraftforge/gradle/util/SourceDirSetSupplier.java
|
|
@@ -19,13 +19,13 @@
|
|
*/
|
|
package net.minecraftforge.gradle.util;
|
|
|
|
-import com.beust.jcommander.internal.Lists;
|
|
+import com.google.common.collect.Lists;
|
|
+import com.google.common.collect.Maps;
|
|
import net.minecraftforge.srg2source.util.io.InputSupplier;
|
|
import net.minecraftforge.srg2source.util.io.OutputSupplier;
|
|
import org.gradle.api.file.FileVisitDetails;
|
|
import org.gradle.api.file.FileVisitor;
|
|
import org.gradle.api.file.SourceDirectorySet;
|
|
-import org.testng.collections.Maps;
|
|
|
|
import java.io.*;
|
|
import java.util.List;
|
|
diff --git a/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java b/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java
|
|
index b75f653..fa61537 100644
|
|
--- a/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java
|
|
+++ b/src/main/java/net/minecraftforge/gradle/util/json/JsonFactory.java
|
|
@@ -26,7 +26,6 @@ import java.io.IOException;
|
|
import java.util.*;
|
|
import java.util.Map.Entry;
|
|
|
|
-import com.beust.jcommander.internal.Lists;
|
|
import com.google.common.base.Strings;
|
|
import com.google.common.reflect.TypeToken;
|
|
import com.google.gson.Gson;
|
|
--
|
|
2.9.5
|
|
|