Fix PlugPluginTest on Java 8.

Author: nedtwigg

atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/gradle/PlugPluginTest.kt

@@ -63,7 +63,7 @@ class PlugPluginTest : GradleIntegrationHarness() {
 								"    }\n" +
 								"}")
 		assertFile("src/main/resources/META-INF/MANIFEST.MF")
-				.hasContent(
+				.hasContentIgnoreWhitespace(
 						"Manifest-Version: 1.0\n" +
 								"Service-Component: OSGI-INF/com.diffplug.atplug.Apple.xml,OSGI-INF/com.d\n" +
 								" iffplug.atplug.Orange.xml,OSGI-INF/com.diffplug.atplug.Shape\$Circle.xml\n" +

atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/gradle/ResourceHarness.java

@@ -91,6 +91,12 @@ private ReadAsserter(File file) throws IOException {
 		public void hasContent(String expected) {
 			Assertions.assertEquals(expected, content);
 		}
+
+		public void hasContentIgnoreWhitespace(String expected) {
+			String actualClean = content.replace("\n", "").replace(" ", "");
+			String expectedClean = expected.replace("\n", "").replace(" ", "");
+			Assertions.assertEquals(expectedClean, actualClean);
+		}
 	}
 
 	protected WriteAsserter setFile(String path) throws IOException {

atplug-runtime/src/main/java/com/diffplug/atplug/PlugRegistry.kt

@@ -37,8 +37,10 @@ interface PlugRegistry {
 					URL(manifestUrl.substring(0, manifestUrl.length - PATH_MANIFEST.length) + servicePath)
 
 			val out = ByteArrayOutputStream()
-			serviceUrl.openStream().transferTo(out)
-			val serviceFileContent = out.toString(StandardCharsets.UTF_8)
+			serviceUrl.openStream().use {
+				it.copyTo(out)
+			}
+			val serviceFileContent = String(out.toByteArray(), StandardCharsets.UTF_8)
 			return PlugDescriptor.fromJson(serviceFileContent)
 		}