Upgrade to Scala 2.13.4, switch CI to JDK 15

2.13.4 brings JDK 15 support with scala/scala#9292 - tests/run/t8153.scala was removed like it was removed in Scala 2 with scala/scala@8f6e522 - tests/neg/missing-implicit-2.check was updated because the implicitNotFound message was changed in 2.13.4 - tests/run/t6260-delambdafy.scala had to be changed to behave the same under JDK <= 15 and JDK 15.
dotty-staging · Nov 22, 2020 · 60976ce · 60976ce
1 parent fb1c3c0
commit 60976ce
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 51 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
   test:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -22,8 +22,8 @@ jobs:
            startsWith(github.event.ref, 'refs/tags/sbt-dotty-'))"
 
     steps:
-      - name: Set JDK 14 as default
-        run: echo "/usr/lib/jvm/java-14-openjdk-amd64/bin" >> $GITHUB_PATH
+      - name: Set JDK 15 as default
+        run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH
 
       - name: Checkout cleanup script
         uses: actions/checkout@v2
@@ -45,7 +45,7 @@ jobs:
   test_bootstrapped:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -54,8 +54,8 @@ jobs:
            startsWith(github.event.ref, 'refs/tags/sbt-dotty-'))"
 
     steps:
-      - name: Set JDK 14 as default
-        run: echo "/usr/lib/jvm/java-14-openjdk-amd64/bin" >> $GITHUB_PATH
+      - name: Set JDK 15 as default
+        run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH
 
       - name: Checkout cleanup script
         uses: actions/checkout@v2
@@ -110,7 +110,7 @@ jobs:
   community_build_a:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -138,7 +138,7 @@ jobs:
   community_build_b:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -166,7 +166,7 @@ jobs:
   test_sbt:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -196,7 +196,7 @@ jobs:
   test_java8:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -231,7 +231,7 @@ jobs:
   publish_nightly:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -265,7 +265,7 @@ jobs:
   nightly_documentation:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -306,7 +306,7 @@ jobs:
   publish_release:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -388,7 +388,7 @@ jobs:
   release_documentation:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
@@ -432,7 +432,7 @@ jobs:
   publish_sbt_release:
     runs-on: [self-hosted, Linux]
     container:
-      image: lampepfl/dotty:2020-09-08
+      image: lampepfl/dotty:2020-11-19
       volumes:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache

diff --git a/community-build/community-projects/scala-parser-combinators b/community-build/community-projects/scala-parser-combinators
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -297,7 +297,7 @@ object projects:
 
   lazy val scalaParserCombinators = SbtCommunityProject(
     project          = "scala-parser-combinators",
-    sbtTestCommand   = "parserCombinators/test",
+    sbtTestCommand   = "parserCombinatorsJVM/test",
   )
 
   lazy val dottyCpsAsync = SbtCommunityProject(

diff --git a/compiler/src/dotty/tools/dotc/core/NameOps.scala b/compiler/src/dotty/tools/dotc/core/NameOps.scala
@@ -2,6 +2,7 @@ package dotty.tools.dotc
 package core
 
 import java.security.MessageDigest
+import java.nio.CharBuffer
 import scala.io.Codec
 import Int.MaxValue
 import Names._, StdNames._, Contexts._, Symbols._, Flags._, NameKinds._, Types._
@@ -32,17 +33,18 @@ object NameOps {
     def apply(s: String): String = {
       val marker = "$$$$"
 
-      val MaxNameLength = (CLASSFILE_NAME_CHAR_LIMIT - 6) min
+      val MaxNameLength = (CLASSFILE_NAME_CHAR_LIMIT - 6).min(
         2 * (CLASSFILE_NAME_CHAR_LIMIT - 6 - 2 * marker.length - 32)
+      )
 
       def toMD5(s: String, edge: Int): String = {
-        val prefix = s take edge
-        val suffix = s takeRight edge
+        val prefix = s.take(edge)
+        val suffix = s.takeRight(edge)
 
         val cs = s.toArray
-        val bytes = Codec toUTF8 cs
-        md5 update bytes
-        val md5chars = (md5.digest() map (b => (b & 0xFF).toHexString)).mkString
+        val bytes = Codec.toUTF8(CharBuffer.wrap(cs))
+        md5.update(bytes)
+        val md5chars = md5.digest().map(b => (b & 0xFF).toHexString).mkString
 
         prefix + marker + md5chars + marker + suffix
       }

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -724,7 +724,7 @@ trait Applications extends Compatibility {
 
     def makeVarArg(n: Int, elemFormal: Type): Unit = {
       val args = typedArgBuf.takeRight(n).toList
-      typedArgBuf.trimEnd(n)
+      typedArgBuf.dropRightInPlace(n)
       val elemtpt = TypeTree(elemFormal)
       typedArgBuf += seqToRepeated(SeqLiteral(args, elemtpt))
     }

diff --git a/project/Build.scala b/project/Build.scala
@@ -72,8 +72,8 @@ object Build {
    *  scala-library.
    */
   def stdlibVersion(implicit mode: Mode): String = mode match {
-    case NonBootstrapped => "2.13.3"
-    case Bootstrapped => "2.13.3"
+    case NonBootstrapped => "2.13.4"
+    case Bootstrapped => "2.13.4"
   }
 
   val dottyOrganization = "org.scala-lang"

diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i8847/build.sbt
@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.3"
+val scala2Version = "2.13.4"
 
 lazy val `i8847-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916a/build.sbt
@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.3"
+val scala2Version = "2.13.4"
 
 lazy val `i9916a-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/build.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916b/build.sbt
@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.3"
+val scala2Version = "2.13.4"
 
 lazy val `i9916b-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

diff --git a/tests/neg/missing-implicit-2.check b/tests/neg/missing-implicit-2.check
@@ -1,12 +1,12 @@
 -- Error: tests/neg/missing-implicit-2.scala:4:24 ----------------------------------------------------------------------
 4 |val f = Future[Unit] { } // error
   |                        ^
-  |                     Cannot find an implicit ExecutionContext. You might pass
+  |                     Cannot find an implicit ExecutionContext. You might add
   |                     an (implicit ec: ExecutionContext) parameter to your method.
   |
   |                     The ExecutionContext is used to configure how and on which
-  |                     thread pools Futures will run, so the specific ExecutionContext
-  |                     that is selected is important.
+  |                     thread pools asynchronous tasks (such as Futures) will run,
+  |                     so the specific ExecutionContext that is selected is important.
   |
   |                     If your application does not define an ExecutionContext elsewhere,
   |                     consider using Scala's global ExecutionContext by defining

diff --git a/tests/run/t6260-delambdafy.check b/tests/run/t6260-delambdafy.check
@@ -1,5 +1,3 @@
 f(C@2e)
 
 apply
-get$Lambda
-writeReplace
diff --git a/tests/run/t6260-delambdafy.scala b/tests/run/t6260-delambdafy.scala
@@ -1,10 +1,12 @@
+import java.lang.reflect.Modifier
+
 class C[A](private val a: Any) extends AnyVal
 
 object Test {
   val f = (x: C[Any]) => {println(s"f($x)"); x}
   def main(args: Array[String]): Unit = {
      f(new C("."))
-     val methods = f.getClass.getDeclaredMethods.map(_.getName).sorted
+     val methods = f.getClass.getDeclaredMethods.filter(m => (m.getModifiers & Modifier.PRIVATE) == 0).map(_.getName).sorted
      println("")
      println(methods.mkString("\n"))
   }

diff --git a/tests/run/t8153.check b/tests/run/t8153.check
diff --git a/tests/run/t8153.scala b/tests/run/t8153.scala