bump Scala, sbt, Scala.js versions

scala · Sep 15, 2020 · 57353cd · 57353cd
1 parent c60de43
commit 57353cd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,19 +6,19 @@ language: scala
 
 scala:
   - 2.11.12
-  - 2.12.10
-  - 2.13.1
+  - 2.12.12
+  - 2.13.3
 
 env:
   - SCALAJS_VERSION=         ADOPTOPENJDK=8
-  - SCALAJS_VERSION=0.6.32   ADOPTOPENJDK=8
+  - SCALAJS_VERSION=0.6.33   ADOPTOPENJDK=8
   - SCALAJS_VERSION=1.0.1    ADOPTOPENJDK=8
   - SCALAJS_VERSION=         ADOPTOPENJDK=11
 
 matrix:
   exclude:
     - scala: 2.11.12
-      env: SCALAJS_VERSION=0.6.32   ADOPTOPENJDK=8
+      env: SCALAJS_VERSION=0.6.33   ADOPTOPENJDK=8
     - scala: 2.11.12
       env: SCALAJS_VERSION=1.0.1    ADOPTOPENJDK=8
 

diff --git a/jvm/src/test/scala/scala/xml/CompilerErrors.scala b/jvm/src/test/scala/scala/xml/CompilerErrors.scala
@@ -4,14 +4,20 @@ import org.junit.Test
 
 class CompilerErrors extends CompilerTesting {
   @Test
-  def t7185() =
-    expectXmlError("""|overloaded method value apply with alternatives:
-                      |  (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
-                      |  (i: Int)scala.xml.Node
-                      | cannot be applied to ()""".stripMargin,
+  def t7185() = {
+    // the error message here differs a bit by Scala version
+    import util.Properties.versionNumberString
+    val thing =
+      if (versionNumberString.startsWith("2.11") || versionNumberString.startsWith("2.12")) "method value"
+      else "method"
+    expectXmlError(s"""|overloaded $thing apply with alternatives:
+                       |  (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
+                       |  (i: Int)scala.xml.Node
+                       | cannot be applied to ()""".stripMargin,
      """|object Test {
         |  <e></e>()
         |}""")
+  }
 
   @Test
   def t1878_typer() =

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.3.13
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.32")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.33")
 
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.3")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")