From 1ca6b97de2a60116854434d512f4152bd6415fd3 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 28 Jan 2019 12:15:16 -0800 Subject: [PATCH] JDK 11 fixes In JDK 11, String.lines returns java.util.stream.Stream[String]. Switch to linesIterator instead. --- main/src/main/scala/sbt/internal/LayeredClassLoader.scala | 2 +- main/src/main/scala/sbt/internal/PrettyPrint.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/internal/LayeredClassLoader.scala b/main/src/main/scala/sbt/internal/LayeredClassLoader.scala index 20fe9564d..a2c00de52 100644 --- a/main/src/main/scala/sbt/internal/LayeredClassLoader.scala +++ b/main/src/main/scala/sbt/internal/LayeredClassLoader.scala @@ -43,7 +43,7 @@ private[sbt] class LayeredClassLoader( | classpath = | ${classpath mkString "\n "} | parent = - | ${parent.toString.lines.mkString("\n ")} + | ${parent.toString.linesIterator.mkString("\n ")} |)""".stripMargin } diff --git a/main/src/main/scala/sbt/internal/PrettyPrint.scala b/main/src/main/scala/sbt/internal/PrettyPrint.scala index a769f4ce9..04683313b 100644 --- a/main/src/main/scala/sbt/internal/PrettyPrint.scala +++ b/main/src/main/scala/sbt/internal/PrettyPrint.scala @@ -10,6 +10,6 @@ package sbt.internal private[sbt] object PrettyPrint { private[sbt] def indent(any: Any, level: Int): String = { val i = " " * level - any.toString.lines.mkString(i, "\n" + i, "") + any.toString.linesIterator.mkString(i, "\n" + i, "") } }