AsyncGradleTask now considers the replaceLfOnStdIn global property.

kelemen · May 22, 2015 · f0f4f8f · f0f4f8f
1 parent cfc130b
commit f0f4f8f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/netbeans-gradle-plugin/src/main/java/org/netbeans/gradle/project/tasks/AsyncGradleTask.java b/netbeans-gradle-plugin/src/main/java/org/netbeans/gradle/project/tasks/AsyncGradleTask.java
@@ -3,6 +3,7 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.io.Reader;
 import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -61,6 +62,7 @@
 import org.netbeans.gradle.project.output.OutputUrlConsumer;
 import org.netbeans.gradle.project.output.ProjectFileConsumer;
 import org.netbeans.gradle.project.output.ReaderInputStream;
+import org.netbeans.gradle.project.output.ReplaceLineFeedReader;
 import org.netbeans.gradle.project.output.SmartOutputHandler;
 import org.netbeans.gradle.project.output.StackTraceConsumer;
 import org.netbeans.gradle.project.output.TaskIOTab;
@@ -250,7 +252,13 @@ private static OutputRef configureOutput(
 
         buildLauncher.setStandardOutput(new WriterOutputStream(forwardedStdOut));
         buildLauncher.setStandardError(new WriterOutputStream(forwardedStdErr));
-        buildLauncher.setStandardInput(new ReaderInputStream(tab.getIo().getInRef()));
+
+        Reader input = tab.getIo().getInRef();
+        if (GlobalGradleSettings.getDefault().replaceLfOnStdIn().getValue()) {
+            input = ReplaceLineFeedReader.replaceLfWithOsLineSeparator(input);
+        }
+
+        buildLauncher.setStandardInput(new ReaderInputStream(input));
 
         return new OutputRef(forwardedStdOut, forwardedStdErr);
     }