Merge branch 'SethTisue-fix-build-on-jdk11' into 3.1.x

Author: bvenners

scalactic-macro/src/main/scala/org/scalactic/anyvals/NumericString.scala

@@ -1531,7 +1531,7 @@ final class NumericString private (val value: String) extends AnyVal {
    * returns a single string for `NumericString`.
    */
   def lines: Iterator[String] =
-    value.lines
+    value.linesIterator
 
   /** Return all lines in this `NumericString` in an iterator,
    *  including trailing line end characters.  Always returns a

scalactic-test/src/test/scala/org/scalactic/anyvals/NumericStringSpec.scala

@@ -1318,7 +1318,7 @@ class NumericStringSpec extends FunSpec with Matchers with GeneratorDrivenProper
     it("should offer a lines method consistent with StringOps") {
       forAll { (numStr: NumericString) =>
         numStr.lines.mkString(",") shouldEqual
-          numStr.value.lines.mkString(",")
+          numStr.value.linesIterator.mkString(",")
       }
     }
     it("should offer a linesWithSeparators method consistent with StringOps") {

scalatest/src/main/scala/org/scalatest/Doc.scala

@@ -144,7 +144,7 @@ println("&&&&&&&&&&&")
 
   private[scalatest] def getSnippets(text: String): Vector[Snippet] = {
 //println("text: " + text)
-    val lines = Vector.empty ++ text.lines.toIterable
+    val lines = Vector.empty ++ text.linesIterator.toIterable
 //println("lines: " + lines)
     val pairs = lines map { line =>
       val trimmed = line.trim
@@ -186,7 +186,7 @@ println("&&&&&&&&&&&")
 private[scalatest] object Doc {
 
   private[scalatest] def trimMarkup(text: String): String = {
-    val lines = text.lines.toList
+    val lines = text.linesIterator.toList
     val zipLines = lines.zipWithIndex
     val firstNonWhiteLine = zipLines.find { case (line, _) => !line.trim.isEmpty }
     val lastNonWhiteLine = zipLines.reverse.find { case (line, _) => !line.trim.isEmpty }
@@ -197,7 +197,7 @@ private[scalatest] object Doc {
   }
 
   private[scalatest] def stripMargin(text: String): String = {
-    val lines = text.lines.toList
+    val lines = text.linesIterator.toList
     val firstNonWhiteLine = lines.find(!_.trim.isEmpty)
     firstNonWhiteLine match {
       case None => text.trim

scalatest/src/main/scala/org/scalatest/DocSpec.scala

@@ -41,7 +41,7 @@ private[scalatest] abstract class DocSpec extends DocSpecLike {
 private[scalatest] object DocSpec {
 
   def trimMarkup(text: String): String = {
-    val lines = text.lines.toList
+    val lines = text.linesIterator.toList
     val zipLines = lines.zipWithIndex
     val firstNonWhiteLine = zipLines.find { case (line, _) => !line.trim.isEmpty }
     val lastNonWhiteLine = zipLines.reverse.find { case (line, _) => !line.trim.isEmpty } 
@@ -52,7 +52,7 @@ private[scalatest] object DocSpec {
   }
 
   def stripMargin(text: String): String = {
-    val lines = text.lines.toList
+    val lines = text.linesIterator.toList
     val firstNonWhiteLine = lines.find(!_.trim.isEmpty)
     firstNonWhiteLine match {
       case None => text.trim