Merge pull request #5175 from dotty-staging/upgrade-2.12.7

Upgrade to Scala 2.12.7, fix compilation and running tests on Java 11

Author: smarter

.drone.yml

@@ -23,23 +23,23 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test:
     group: test
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt ";compile ;test"
       - ./project/scripts/cmdTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
       - ./project/scripts/bootstrapCmdTests
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
@@ -49,7 +49,7 @@ pipeline:
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -61,7 +61,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -72,7 +72,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -96,7 +96,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2018-09-14-2
+    image: lampepfl/dotty:2018-10-01
     environment:
       - RELEASEBUILD=yes
     commands:

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -91,15 +91,15 @@ trait MessageRendering {
     * @return aligned error message
     */
   def errorMsg(pos: SourcePosition, msg: String, offset: Int)(implicit ctx: Context): String = {
-    val padding = msg.lines.foldLeft(pos.startColumnPadding) { (pad, line) =>
+    val padding = msg.linesIterator.foldLeft(pos.startColumnPadding) { (pad, line) =>
       val lineLength = stripColor(line).length
       val maxPad = math.max(0, ctx.settings.pageWidth.value - offset - lineLength) - offset
 
       if (maxPad < pad.length) " " * maxPad
       else pad
     }
 
-    msg.lines
+    msg.linesIterator
       .map { line => " " * (offset - 1) + "|" + padding + line}
       .mkString(sys.props("line.separator"))
   }

compiler/test-resources/type-printer/prefixless

@@ -7,4 +7,4 @@ val res2: Seq[Char] = List(a, b)
 scala> Set(4, 5)
 val res3: Set[Int] = Set(4, 5)
 scala> Iterator(1)
-val res4: Iterator[Int] = non-empty iterator
+val res4: Iterator[Int] = <iterator>

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -613,7 +613,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       else runMain(testSource.runClassPath) match {
         case Success(_) if !checkFile.isDefined || !checkFile.get.exists => // success!
         case Success(output) => {
-          val outputLines = output.lines.toArray :+ DiffUtil.EOF
+          val outputLines = output.linesIterator.toArray :+ DiffUtil.EOF
           val checkLines: Array[String] = Source.fromFile(checkFile.get).getLines().toArray :+ DiffUtil.EOF
           val sourceTitle = testSource.title
 
@@ -1027,7 +1027,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         case test.TimeoutFailure(title) =>
           s"  - test '$title' timed out"
         case test.JavaCompilationFailure(msg) =>
-          s"  - java compilation failed with:\n${ msg.lines.map("      " + _).mkString("\n") }"
+          s"  - java compilation failed with:\n${ msg.linesIterator.map("      " + _).mkString("\n") }"
       }.mkString("\n")
     }
 

dist/bin/common

@@ -61,14 +61,6 @@ if [ ! -x "$JAVACMD" ] ; then
   exit 1
 fi
 
-# parses 1.7, 1.8, 9, etc out of java version "1.8.0_91"
-JAVA_VERSION=$("$JAVACMD" -version 2>&1 | grep ' version "' | tr '\r' '\n' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
-
-if [ "$JAVA_VERSION" != "1.8" ] ; then
-  echo "Error: Java 8 is required, actual $JAVA_VERSION"
-  exit 1
-fi
-
 if [ -z "$JAVA_HOME" ] ; then
   echo "Warning: JAVA_HOME environment variable is not set."
 fi

doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala

@@ -21,6 +21,6 @@ trait CommentCleaner {
       SafeTags.replaceAllIn(javadoclessComment, { mtch =>
         Matcher.quoteReplacement(safeTagMarker + mtch.matched + safeTagMarker)
       })
-    markedTagComment.lines.toList map (cleanLine)
+    markedTagComment.linesIterator.toList map (cleanLine)
   }
 }

doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala

@@ -115,7 +115,7 @@ trait Page {
     val withoutYaml = virtualFile(
       if (content.startsWith("---\n")) {
         val str =
-          content.lines
+          content.linesIterator
           .drop(1)
           .dropWhile(line => line != "---" && line != "...")
           .drop(1).mkString("\n")

project/Build.scala

@@ -36,7 +36,7 @@ object ExposedValues extends AutoPlugin {
 object Build {
 
   val baseVersion = "0.10.0"
-  val scalacVersion = "2.12.6"
+  val scalacVersion = "2.12.7"
 
   val dottyOrganization = "ch.epfl.lamp"
   val dottyGithubUrl = "https://github.com/lampepfl/dotty"