Apply backwards compatiblity to RecompileMC task as well.

Also cleanup the OSX ext path 'fix' to actually.. set the path to something.

Author: jriwanek

src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java

@@ -34,6 +34,7 @@
 import net.minecraftforge.gradle.util.caching.CachedTask;
 
 import org.gradle.api.AntBuilder;
+import org.gradle.api.Task;
 import org.gradle.api.AntBuilder.AntMessagePriority;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileVisitDetails;
@@ -127,7 +128,7 @@ public void doStuff() throws IOException
                     col = col.plus(config);
             }
 
-            AntBuilder ant = this.setupAnt();
+            AntBuilder ant = CreateStartTask.setupAnt(this);
             // INVOKE!
             ant.invokeMethod("javac", ImmutableMap.builder()
                     .put("srcDir", resourceDir.getCanonicalPath())
@@ -161,10 +162,10 @@ public void visitFile(FileVisitDetails arg0)
 
     }
 
-    private AntBuilder setupAnt()
+    public static AntBuilder setupAnt(Task task)
     {
-        AntBuilder ant = this.getAnt();
-        LogLevel startLevel = getProject().getGradle().getStartParameter().getLogLevel();
+        AntBuilder ant = task.getAnt();
+        LogLevel startLevel = task.getProject().getGradle().getStartParameter().getLogLevel();
         if (startLevel.compareTo(LogLevel.LIFECYCLE) >= 0)
         {
             GradleVersion v2_14 = GradleVersion.version("2.14");
@@ -175,10 +176,10 @@ private AntBuilder setupAnt()
             else
             {
                 try {
-                    LoggingManager.class.getMethod("setLevel", LogLevel.class).invoke(getLogging(), LogLevel.ERROR);
+                    LoggingManager.class.getMethod("setLevel", LogLevel.class).invoke(task.getLogging(), LogLevel.ERROR);
                 } catch (Exception e) {
                     //Couldn't find it? We are on some weird version oh well.
-                    this.getLogger().info("Could not set log level:", e);
+                    task.getLogger().info("Could not set log level:", e);
                 }
             }
         }

src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java

@@ -29,14 +29,13 @@
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import net.minecraftforge.gradle.tasks.CreateStartTask;
 import net.minecraftforge.gradle.util.caching.Cached;
 import net.minecraftforge.gradle.util.caching.CachedTask;
 
 import org.gradle.api.AntBuilder;
-import org.gradle.api.AntBuilder.AntMessagePriority;
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
-import org.gradle.api.logging.LogLevel;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Optional;
@@ -48,9 +47,6 @@
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 
-import groovy.lang.Closure;
-import groovy.util.BuilderSupport;
-
 public class TaskRecompileMc extends CachedTask
 {
     @InputFile
@@ -83,15 +79,9 @@ public void doStuff() throws IOException
         // extract sources
         extractSources(tempSrc, inJar);
 
-        AntBuilder ant = this.getAnt();
-        // Remove errors on normal runs
-        LogLevel startLevel = getProject().getGradle().getStartParameter().getLogLevel();
-        if (startLevel.compareTo(LogLevel.LIFECYCLE) >= 0) {
-            ant.setLifecycleLogLevel(AntMessagePriority.ERROR);
-        }
-
+        AntBuilder ant = CreateStartTask.setupAnt(this);
         // recompile
-        ant.invokeMethod("javac", new Object[] {
+        ant.invokeMethod("javac",
             ImmutableMap.builder()
                 .put("srcDir", tempSrc.getCanonicalPath())
                 .put("destDir", tempCls.getCanonicalPath())
@@ -102,36 +92,33 @@ public void doStuff() throws IOException
                 .put("source", "1.6")
                 .put("target", "1.6")
                 .put("debug", "true")
-                .build(),
-            new Closure<Object>(TaskRecompileMc.class) {
-                protected Object doCall(Object arguments) {
-                    String currentExtDirs = System.getProperty("java.ext.dirs");
-                    String newExtDirs = "";
-                    String[] parts = currentExtDirs.split(File.pathSeparator);
-                    if (parts.length > 0) {
-                        String lastPart = parts[parts.length - 1];
-                        for (String part : parts) {
-                            if (!part.equals("/System/Library/Java/Extensions")) {
-                                newExtDirs += part;
-                                if (!part.equals(lastPart)) {
-                                    newExtDirs += File.pathSeparator;
-                                }
-                            }
-                        }
-                    }
-                    ((BuilderSupport) getDelegate()).invokeMethod("compilerarg",
-                        // Remove old vecmath
-                        ImmutableMap.of("line", "-Djava.ext.dirs=${newExtDirs}")
-                    );
-                    return null;
-                }
-            }
-        });
+                .put("java.ext.dirs", getExtPath())
+                .build()
+        );
 
         outJar.getParentFile().mkdirs();
         createOutput(outJar, inJar, tempCls, getInResources());
     }
 
+    private static String getExtPath()
+    {
+        String currentExtDirs = System.getProperty("java.ext.dirs");
+        String newExtDirs = "";
+        String[] parts = currentExtDirs.split(File.pathSeparator);
+        if (parts.length > 0) {
+            String lastPart = parts[parts.length - 1];
+            for (String part : parts) {
+                if (!part.equals("/System/Library/Java/Extensions")) {
+                    newExtDirs += part;
+                    if (!part.equals(lastPart)) {
+                        newExtDirs += File.pathSeparator;
+                    }
+                }
+            }
+        }
+        return newExtDirs;
+    }
+
     private static void extractSources(File tempDir, File inJar) throws IOException
     {
         ZipInputStream zin = new ZipInputStream(new FileInputStream(inJar));
@@ -160,7 +147,7 @@ private void createOutput(File outJar, File sourceJar, File classDir, File resou
         JarOutputStream zout = new JarOutputStream(new FileOutputStream(outJar));
 
         Visitor visitor = new Visitor(zout, elementsAdded);
-        
+
         // custom resources should override existing ones, so resources first.
         if (resourceJar != null)
         {