Merge pull request #53 from hacki11/ft-nosplash

nosplash

Author: nedtwigg

CHANGES.md

@@ -2,7 +2,10 @@
 
 ### Version 3.10.0 - TBD ([javadoc](http://diffplug.github.io/goomph/javadoc/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/gradle/goomph/))
 
+- Added nosplash argument to EclipseApp in order to prevent splash screens during gradle tasks. [(#53)](https://github.com/diffplug/goomph/pull/53)
 - Added a feature to provide a custom goomph-pde-bootstrap installation. [(#52)](https://github.com/diffplug/goomph/pull/52)
+- Fix typo in `GOOMPH_PDE_UPDATE_SITE` property (was accidentally UDPATE). [(#48)](https://github.com/diffplug/goomph/pull/48)
+	- Old spelling (UDPATE) is still supported for backward-compatibility.
 
 ### Version 3.9.1 - February 2nd 2018 ([javadoc](http://diffplug.github.io/goomph/javadoc/3.9.1/), [jcenter](https://bintray.com/diffplug/opensource/goomph/3.9.1/view))
 

src/main/java/com/diffplug/gradle/eclipserunner/EclipseApp.java

@@ -96,6 +96,8 @@ public EclipseApp(String application) {
 		// this flag disables that behavior, so that it can be used on headless build servers
 		// https://wiki.eclipse.org/Equinox_Launcher
 		addArg("-launcher.suppressErrors");
+		// suppress eclipse splash screen
+		addArg("nosplash");
 		addArg("application", application);
 	}
 

src/main/java/com/diffplug/gradle/eclipserunner/EquinoxLauncher.java

@@ -110,9 +110,11 @@ private File getPluginRequireSingle(String name) {
 	/** Sets the application arguments which will be passed to the runtime. */
 	public EquinoxLauncher setArgs(List<String> args) {
 		// Filter --launcher.suppressErrors
+		// Filter --nosplash
 		List<String> filteredArgs = args.stream()
 				.filter(Objects::nonNull)
 				.filter(arg -> !arg.equals("--launcher.suppressErrors"))
+				.filter(arg -> !arg.equals("-nosplash"))
 				.collect(toList());
 		this.args = ImmutableList.copyOf(filteredArgs);
 		return this;

src/test/java/com/diffplug/gradle/GoomphCacheLocationInitFromProjectTest.java

@@ -40,7 +40,7 @@ public void ensureOverrideWorks() throws IOException {
 		try (Writer writer = printer.toPrintWriter()) {
 			gradleRunner().forwardStdOutput(writer).build();
 		}
-		String firstLine = buffer.toString().split("\n")[0];
+		String firstLine = buffer.toString().split(System.getProperty("line.separator"))[0];
 		Assert.assertEquals("Optional[somewhere]", firstLine);
 	}
 }

src/test/java/com/diffplug/gradle/eclipserunner/EclipseAppTest.java

@@ -30,8 +30,8 @@ public void test() {
 		app.addArg("prop", "a");
 		app.addArg("prop", "b");
 		app.addArg("flag");
-		Assert.assertEquals("--launcher.suppressErrors -application diffplug -prop a,b -flag", Joiner.on(" ").join(app.toArgList()));
-		Assert.assertEquals("--launcher.suppressErrors\n-application diffplug\n-prop a,b\n-flag\n", app.toString());
+		Assert.assertEquals("--launcher.suppressErrors -nosplash -application diffplug -prop a,b -flag", Joiner.on(" ").join(app.toArgList()));
+		Assert.assertEquals("--launcher.suppressErrors\n-nosplash\n-application diffplug\n-prop a,b\n-flag\n", app.toString());
 	}
 
 	@Test
@@ -40,7 +40,7 @@ public void testDoubleAdd() {
 		app.addArg("flag");
 		app.addArg("flag");
 		app.addArg("flag");
-		Assert.assertEquals("--launcher.suppressErrors -application diffplug -flag", Joiner.on(" ").join(app.toArgList()));
+		Assert.assertEquals("--launcher.suppressErrors -nosplash -application diffplug -flag", Joiner.on(" ").join(app.toArgList()));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -52,14 +52,15 @@ public void testAnt() {
 		task.attributes().put("prop", "propvalue");
 		ant.setTask(task);
 
-		Assert.assertEquals("--launcher.suppressErrors -application org.eclipse.ant.core.antRunner -Dkey=value", Joiner.on(" ").join(ant.toArgList()));
+		Assert.assertEquals("--launcher.suppressErrors -nosplash -application org.eclipse.ant.core.antRunner -Dkey=value", Joiner.on(" ").join(ant.toArgList()));
 		Assert.assertEquals(StringPrinter.buildStringFromLines(
 				"<?xml version=\"1.0\" encoding=\"UTF-8\"?><project>",
 				"  <anttask prop=\"propvalue\"/>",
 				"</project>"), ant.buildXml());
 		Assert.assertEquals(StringPrinter.buildStringFromLines(
 				"### ARGS ###",
 				"--launcher.suppressErrors",
+				"-nosplash",
 				"-application org.eclipse.ant.core.antRunner",
 				"-Dkey=value",
 				"",

src/test/java/com/diffplug/gradle/p2/P2ModelTest.java

@@ -40,6 +40,7 @@ public void testDirectorArgs() {
 		String actual = testData().directorApp(dest, "profile").completeState();
 		String expected = StringPrinter.buildStringFromLines(
 				"--launcher.suppressErrors",
+				"-nosplash",
 				"-application org.eclipse.equinox.p2.director",
 				"-clean",
 				"-consolelog",
@@ -59,6 +60,7 @@ public void testMirrorAntFile() {
 		String expected = StringPrinter.buildStringFromLines(
 				"### ARGS ###",
 				"--launcher.suppressErrors",
+				"-nosplash",
 				"-application org.eclipse.ant.core.antRunner",
 				"",
 				"### BUILD.XML ###",
@@ -88,6 +90,7 @@ public void testMirrorAntFileWithSlicingOptions() {
 		String expected = StringPrinter.buildStringFromLines(
 				"### ARGS ###",
 				"--launcher.suppressErrors",
+				"-nosplash",
 				"-application org.eclipse.ant.core.antRunner",
 				"",
 				"### BUILD.XML ###",
@@ -116,6 +119,7 @@ public void testMirrorAntFileWithAppend() {
 		String expected = StringPrinter.buildStringFromLines(
 				"### ARGS ###",
 				"--launcher.suppressErrors",
+				"-nosplash",
 				"-application org.eclipse.ant.core.antRunner",
 				"",
 				"### BUILD.XML ###",
@@ -142,6 +146,7 @@ public void testMirrorAntFileWithAppendDefault() {
 		String expected = StringPrinter.buildStringFromLines(
 				"### ARGS ###",
 				"--launcher.suppressErrors",
+				"-nosplash",
 				"-application org.eclipse.ant.core.antRunner",
 				"",
 				"### BUILD.XML ###",