From ac89c869e44253dfd98ea5ab3ea55fcaa1baab2f Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 27 Sep 2018 08:30:42 -0500 Subject: [PATCH 1/6] Upgrade to Scala 2.12.7 The Iterator#toString change comes from https://github.com/scala/scala/pull/6668 --- .../test-resources/type-printer/prefixless | 2 +- project/Build.scala | 2 +- tests/run/t8690.check | 2 +- tests/run/view-iterator-stream.check | 48 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/compiler/test-resources/type-printer/prefixless b/compiler/test-resources/type-printer/prefixless index dfc014230b17..0ade08eb186b 100644 --- a/compiler/test-resources/type-printer/prefixless +++ b/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] = diff --git a/project/Build.scala b/project/Build.scala index 1e613cf85813..c42ca2770904 100644 --- a/project/Build.scala +++ b/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" diff --git a/tests/run/t8690.check b/tests/run/t8690.check index 72f076c4d88e..d37e36a53853 100644 --- a/tests/run/t8690.check +++ b/tests/run/t8690.check @@ -1,2 +1,2 @@ -non-empty iterator + abcdef diff --git a/tests/run/view-iterator-stream.check b/tests/run/view-iterator-stream.check index 2da02c865c89..39de54a67e23 100644 --- a/tests/run/view-iterator-stream.check +++ b/tests/run/view-iterator-stream.check @@ -4,9 +4,9 @@ ------------------- toIndexedSeq -> toIterator -> toStream Stream(22, ?) 22 23 24 25 toIndexedSeq -> toIterator -> view StreamView(...) 22 23 24 25 -toIndexedSeq -> toStream -> toIterator non-empty iterator 22 23 24 25 +toIndexedSeq -> toStream -> toIterator 22 23 24 25 toIndexedSeq -> toStream -> view StreamView(...) 22 23 24 25 -toIndexedSeq -> view -> toIterator non-empty iterator 22 23 24 25 +toIndexedSeq -> view -> toIterator 22 23 24 25 toIndexedSeq -> view -> toStream Stream(22, ?) 22 23 24 25 toIterator -> toIndexedSeq -> toStream Stream(22, ?) 22 23 24 25 toIterator -> toIndexedSeq -> view SeqView(...) 22 23 24 25 @@ -14,27 +14,27 @@ toIterator -> toStream -> toIndexedSeq Vector(22, 23, 24, 25) 22 toIterator -> toStream -> view StreamView(...) 22 23 24 25 toIterator -> view -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25 toIterator -> view -> toStream Stream(22, ?) 22 23 24 25 -toStream -> toIndexedSeq -> toIterator non-empty iterator 22 23 24 25 +toStream -> toIndexedSeq -> toIterator 22 23 24 25 toStream -> toIndexedSeq -> view SeqView(...) 22 23 24 25 toStream -> toIterator -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25 toStream -> toIterator -> view StreamView(...) 22 23 24 25 toStream -> view -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25 -toStream -> view -> toIterator non-empty iterator 22 23 24 25 -view -> toIndexedSeq -> toIterator non-empty iterator 22 23 24 25 +toStream -> view -> toIterator 22 23 24 25 +view -> toIndexedSeq -> toIterator 22 23 24 25 view -> toIndexedSeq -> toStream Stream(22, ?) 22 23 24 25 view -> toIterator -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25 view -> toIterator -> toStream Stream(22, ?) 22 23 24 25 view -> toStream -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25 -view -> toStream -> toIterator non-empty iterator 22 23 24 25 +view -> toStream -> toIterator 22 23 24 25 ** take 20 -> drop 10 -> slice(1, 5) ** ------------------- toIndexedSeq -> toIterator -> toStream Stream(12, ?) 12 13 14 15 toIndexedSeq -> toIterator -> view StreamView(...) 12 13 14 15 -toIndexedSeq -> toStream -> toIterator non-empty iterator 12 13 14 15 +toIndexedSeq -> toStream -> toIterator 12 13 14 15 toIndexedSeq -> toStream -> view StreamView(...) 12 13 14 15 -toIndexedSeq -> view -> toIterator non-empty iterator 12 13 14 15 +toIndexedSeq -> view -> toIterator 12 13 14 15 toIndexedSeq -> view -> toStream Stream(12, ?) 12 13 14 15 toIterator -> toIndexedSeq -> toStream Stream(12, ?) 12 13 14 15 toIterator -> toIndexedSeq -> view SeqView(...) 12 13 14 15 @@ -42,27 +42,27 @@ toIterator -> toStream -> toIndexedSeq Vector(12, 13, 14, 15) 12 toIterator -> toStream -> view StreamView(...) 12 13 14 15 toIterator -> view -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15 toIterator -> view -> toStream Stream(12, ?) 12 13 14 15 -toStream -> toIndexedSeq -> toIterator non-empty iterator 12 13 14 15 +toStream -> toIndexedSeq -> toIterator 12 13 14 15 toStream -> toIndexedSeq -> view SeqView(...) 12 13 14 15 toStream -> toIterator -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15 toStream -> toIterator -> view StreamView(...) 12 13 14 15 toStream -> view -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15 -toStream -> view -> toIterator non-empty iterator 12 13 14 15 -view -> toIndexedSeq -> toIterator non-empty iterator 12 13 14 15 +toStream -> view -> toIterator 12 13 14 15 +view -> toIndexedSeq -> toIterator 12 13 14 15 view -> toIndexedSeq -> toStream Stream(12, ?) 12 13 14 15 view -> toIterator -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15 view -> toIterator -> toStream Stream(12, ?) 12 13 14 15 view -> toStream -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15 -view -> toStream -> toIterator non-empty iterator 12 13 14 15 +view -> toStream -> toIterator 12 13 14 15 ** slice(20, 40) -> drop 10 -> take 5 ** ------------------- toIndexedSeq -> toIterator -> toStream Stream(31, ?) 31 32 33 34 35 toIndexedSeq -> toIterator -> view StreamView(...) 31 32 33 34 35 -toIndexedSeq -> toStream -> toIterator non-empty iterator 31 32 33 34 35 +toIndexedSeq -> toStream -> toIterator 31 32 33 34 35 toIndexedSeq -> toStream -> view StreamView(...) 31 32 33 34 35 -toIndexedSeq -> view -> toIterator non-empty iterator 31 32 33 34 35 +toIndexedSeq -> view -> toIterator 31 32 33 34 35 toIndexedSeq -> view -> toStream Stream(31, ?) 31 32 33 34 35 toIterator -> toIndexedSeq -> toStream Stream(31, ?) 31 32 33 34 35 toIterator -> toIndexedSeq -> view SeqView(...) 31 32 33 34 35 @@ -70,27 +70,27 @@ toIterator -> toStream -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 toIterator -> toStream -> view StreamView(...) 31 32 33 34 35 toIterator -> view -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35 toIterator -> view -> toStream Stream(31, ?) 31 32 33 34 35 -toStream -> toIndexedSeq -> toIterator non-empty iterator 31 32 33 34 35 +toStream -> toIndexedSeq -> toIterator 31 32 33 34 35 toStream -> toIndexedSeq -> view SeqView(...) 31 32 33 34 35 toStream -> toIterator -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35 toStream -> toIterator -> view StreamView(...) 31 32 33 34 35 toStream -> view -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35 -toStream -> view -> toIterator non-empty iterator 31 32 33 34 35 -view -> toIndexedSeq -> toIterator non-empty iterator 31 32 33 34 35 +toStream -> view -> toIterator 31 32 33 34 35 +view -> toIndexedSeq -> toIterator 31 32 33 34 35 view -> toIndexedSeq -> toStream Stream(31, ?) 31 32 33 34 35 view -> toIterator -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35 view -> toIterator -> toStream Stream(31, ?) 31 32 33 34 35 view -> toStream -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35 -view -> toStream -> toIterator non-empty iterator 31 32 33 34 35 +view -> toStream -> toIterator 31 32 33 34 35 ** slice(20, 40) -> take 10 -> drop 5 ** ------------------- toIndexedSeq -> toIterator -> toStream Stream(26, ?) 26 27 28 29 30 toIndexedSeq -> toIterator -> view StreamView(...) 26 27 28 29 30 -toIndexedSeq -> toStream -> toIterator non-empty iterator 26 27 28 29 30 +toIndexedSeq -> toStream -> toIterator 26 27 28 29 30 toIndexedSeq -> toStream -> view StreamView(...) 26 27 28 29 30 -toIndexedSeq -> view -> toIterator non-empty iterator 26 27 28 29 30 +toIndexedSeq -> view -> toIterator 26 27 28 29 30 toIndexedSeq -> view -> toStream Stream(26, ?) 26 27 28 29 30 toIterator -> toIndexedSeq -> toStream Stream(26, ?) 26 27 28 29 30 toIterator -> toIndexedSeq -> view SeqView(...) 26 27 28 29 30 @@ -98,15 +98,15 @@ toIterator -> toStream -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 toIterator -> toStream -> view StreamView(...) 26 27 28 29 30 toIterator -> view -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30 toIterator -> view -> toStream Stream(26, ?) 26 27 28 29 30 -toStream -> toIndexedSeq -> toIterator non-empty iterator 26 27 28 29 30 +toStream -> toIndexedSeq -> toIterator 26 27 28 29 30 toStream -> toIndexedSeq -> view SeqView(...) 26 27 28 29 30 toStream -> toIterator -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30 toStream -> toIterator -> view StreamView(...) 26 27 28 29 30 toStream -> view -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30 -toStream -> view -> toIterator non-empty iterator 26 27 28 29 30 -view -> toIndexedSeq -> toIterator non-empty iterator 26 27 28 29 30 +toStream -> view -> toIterator 26 27 28 29 30 +view -> toIndexedSeq -> toIterator 26 27 28 29 30 view -> toIndexedSeq -> toStream Stream(26, ?) 26 27 28 29 30 view -> toIterator -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30 view -> toIterator -> toStream Stream(26, ?) 26 27 28 29 30 view -> toStream -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30 -view -> toStream -> toIterator non-empty iterator 26 27 28 29 30 +view -> toStream -> toIterator 26 27 28 29 30 From befe1ce429c65cd6cad5e497e0907d8cd598d135 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 18 Sep 2018 17:47:21 +0200 Subject: [PATCH 2/6] Fix compilation with JDK 11 The extension method lines is now shadowed by String#lines that returns a Stream, use linesIterator instead (it used to be deprecated in favor of lines, but has been undeprecated in 2.12.7) --- .../dotty/tools/dotc/reporting/MessageRendering.scala | 4 ++-- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 4 ++-- .../tools/dottydoc/model/comment/CommentCleaner.scala | 2 +- .../src/dotty/tools/dottydoc/staticsite/Page.scala | 2 +- tests/run/richs.scala | 10 +++++----- tests/run/t8015-ffc.scala | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index 45f1601bdc98..0cdf717c6f2f 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -91,7 +91,7 @@ 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 @@ -99,7 +99,7 @@ trait MessageRendering { else pad } - msg.lines + msg.linesIterator .map { line => " " * (offset - 1) + "|" + padding + line} .mkString(sys.props("line.separator")) } diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 0b2325ee549a..a49f77aa0501 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/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") } diff --git a/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala index 5b60cd5f9c69..cfcf788af9dd 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala +++ b/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) } } diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala index 1ec870dc236e..7de72693aaea 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala +++ b/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") diff --git a/tests/run/richs.scala b/tests/run/richs.scala index ea870b9c4565..59f833245509 100644 --- a/tests/run/richs.scala +++ b/tests/run/richs.scala @@ -75,11 +75,11 @@ object RichStringTest1 extends RichTest { object RichStringTest2 extends RichTest { def run: Unit = { println("\n" + getObjectName + ":") - Console.print("s1: "); s1.lines foreach println - Console.print("s2: "); s2.lines foreach println - Console.print("s3: "); s3.lines foreach println - Console.print("s4: "); s4.lines foreach println - Console.print("s5: "); s5.lines foreach println + Console.print("s1: "); s1.linesIterator foreach println + Console.print("s2: "); s2.linesIterator foreach println + Console.print("s3: "); s3.linesIterator foreach println + Console.print("s4: "); s4.linesIterator foreach println + Console.print("s5: "); s5.linesIterator foreach println } } object RichStringTest3 extends RichTest { diff --git a/tests/run/t8015-ffc.scala b/tests/run/t8015-ffc.scala index f458cc2acb46..6a4b53dee77e 100644 --- a/tests/run/t8015-ffc.scala +++ b/tests/run/t8015-ffc.scala @@ -2,6 +2,6 @@ object Test extends dotty.runtime.LegacyApp { val ms = """This is a long multiline string with \u000d\u000a CRLF embedded.""" - assert(ms.lines.size == 3, s"lines.size ${ms.lines.size}") + assert(ms.linesIterator.size == 3, s"lines.size ${ms.linesIterator.size}") assert(ms contains "\r\n CRLF", "no CRLF") } From 79c95aaa9454ec22773c6a5727f28db15882c660 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 25 Sep 2018 20:08:36 -0500 Subject: [PATCH 3/6] dist/bin/common: Stop enforcing Java 8 only --- dist/bin/common | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dist/bin/common b/dist/bin/common index 2031b912a5dc..3d2ef0a549e2 100755 --- a/dist/bin/common +++ b/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 From 2759a8a358184e9527730db22cf715a39c608c58 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 25 Sep 2018 20:13:21 -0500 Subject: [PATCH 4/6] Remove source-dependencies/ext This test depends on some proprietary JDK APIs that don't appear to exist anymore on Java 9+ --- sbt-dotty/sbt-test/source-dependencies/ext/A.scala | 5 ----- sbt-dotty/sbt-test/source-dependencies/ext/build.sbt | 11 ----------- .../ext/project/DottyInjectedPlugin.scala | 12 ------------ .../source-dependencies/ext/project/plugins.sbt | 1 - sbt-dotty/sbt-test/source-dependencies/ext/test | 7 ------- 5 files changed, 36 deletions(-) delete mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/A.scala delete mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/build.sbt delete mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala delete mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt delete mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/test diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/A.scala b/sbt-dotty/sbt-test/source-dependencies/ext/A.scala deleted file mode 100644 index ad99310758a7..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/ext/A.scala +++ /dev/null @@ -1,5 +0,0 @@ -import sun.net.spi.nameservice.dns.DNSNameService - -object A { - val x = new DNSNameService -} \ No newline at end of file diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/build.sbt b/sbt-dotty/sbt-test/source-dependencies/ext/build.sbt deleted file mode 100644 index bbc053fa6385..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/ext/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -import complete.DefaultParsers._ - -val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.") - -checkIterations := { - val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis] - - val expected: Int = (Space ~> NatBasic).parsed - val actual: Int = analysis.compilations.allCompilations.size - assert(expected == actual, s"Expected $expected compilations, got $actual") -} \ No newline at end of file diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala deleted file mode 100644 index ce3d46d79921..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,12 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := sys.props("plugin.scalaVersion"), - scalacOptions += "-language:Scala2" - ) -} diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/test b/sbt-dotty/sbt-test/source-dependencies/ext/test deleted file mode 100644 index 2b01a3de7f0c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/ext/test +++ /dev/null @@ -1,7 +0,0 @@ -# initial compilation -> checkIterations 1 - -# no further compilation should be necessary, since nothing changed -# previously, a dependency on a jar in lib/ext/ would -# always force recompilation -> checkIterations 1 \ No newline at end of file From f8a746ef17742486eb4ed8bf743ca7ef52bb979d Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 1 Oct 2018 09:45:36 +0200 Subject: [PATCH 5/6] Fix test failure on Java 11 --- tests/run/t6827.scala | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/run/t6827.scala b/tests/run/t6827.scala index 43e01831c340..8b655e9e6bdd 100644 --- a/tests/run/t6827.scala +++ b/tests/run/t6827.scala @@ -8,6 +8,16 @@ object Test extends App { it.copyToArray(arr, start, len) "ok" } catch { + case e: ArrayIndexOutOfBoundsException => + // Special-case printing this exception because the toString changed in Java 11 + val java11toString = """java.lang.ArrayIndexOutOfBoundsException: Index (-?\d+).*""".r + + e.toString match { + case java11toString(index) => + s"java.lang.ArrayIndexOutOfBoundsException: $index" + case str => + str + } case e: Exception => e.toString } println("%s: %s" format (label, status)) From 890e09ab934fcb655a7ca18de23dce62605c22f4 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 1 Oct 2018 10:05:37 +0200 Subject: [PATCH 6/6] .drone.yml: update image for Scala 2.12.7 --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 712dfc3817e9..048810d286a1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ 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" @@ -31,7 +31,7 @@ pipeline: 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" @@ -39,7 +39,7 @@ pipeline: 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: