merge 1.x onto master

.circleci/config.yml

@@ -20,7 +20,7 @@ commands:
     parameters:
       scala_version:
         type: string
-        default: 2.12.10
+        default: 2.12.12
       sbt_tasks:
         type: string
         default: update compile test:compile test doc package
@@ -44,7 +44,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.10
+        default: 2.12.12
         type: string
       java_version:
         description: "Java version"
@@ -61,7 +61,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.10
+        default: 2.12.12
         type: string
       scalajs_version:
         description: "ScalaJS version"
@@ -81,58 +81,58 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.10
+          name: 2.12.12
           java_version: jdk8
-          scala_version: 2.12.10
+          scala_version: 2.12.12
       - scala_job:
-          name: 2.13.1
+          name: 2.13.3
           java_version: jdk8
-          scala_version: 2.13.1
+          scala_version: 2.13.3
       - scala_job:
           name: dotty-0.27.0-RC1
           java_version: jdk8
           scala_version: 0.27.0-RC1
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
-          scala_version: 2.12.10
+          scala_version: 2.12.12
       - scala_job:
           name: jdk11_2.13
           java_version: jdk11
-          scala_version: 2.13.1
+          scala_version: 2.13.3
       - scala_job:
           name: jdk11_dotty
           java_version: jdk11
           scala_version: 0.27.0-RC1
       - scala_job:
           name: jdk13_2.12
           java_version: jdk13
-          scala_version: 2.12.10
+          scala_version: 2.12.12
       - scala_job:
           name: jdk13_2.13
           java_version: jdk13
-          scala_version: 2.13.1
+          scala_version: 2.13.3
       - scala_job:
           name: jdk13_dotty
           java_version: jdk13
           scala_version: 0.27.0-RC1
       - scala_job:
           name: jdk14_2.12
           java_version: jdk14
-          scala_version: 2.12.10
+          scala_version: 2.12.12
       - scala_job:
           name: jdk14_2.13
           java_version: jdk14
-          scala_version: 2.13.1
+          scala_version: 2.13.3
       - scala_job:
           name: jdk14_dotty
           java_version: jdk14
           scala_version: 0.27.0-RC1
       - scalajs_job:
           name: sjs1.0_2.12
-          scala_version: 2.12.10
+          scala_version: 2.12.12
           scalajs_version: 1.2.0
       - scalajs_job:
           name: sjs1.0_2.13
-          scala_version: 2.13.1
+          scala_version: 2.13.3
           scalajs_version: 1.2.0

.travis.yml

@@ -6,8 +6,8 @@ language: scala
 
 scala:
   - 0.27.0-RC1
-  - 2.12.10
-  - 2.13.1
+  - 2.12.12
+  - 2.13.3
 
 env:
   - SCALAJS_VERSION=         ADOPTOPENJDK=8

build.sbt

@@ -19,7 +19,6 @@ lazy val configSettings: Seq[Setting[_]] = Seq(
   }
 )
 
-
 lazy val xml = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Full)
@@ -28,7 +27,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
   .jvmSettings(ScalaModulePlugin.scalaModuleOsgiSettings)
   .settings(
     name    := "scala-xml",
-
     scalacOptions ++= {
       val opts =
         if (isDotty.value)
@@ -44,7 +42,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
 
     scalaModuleMimaPreviousVersion := {
       if (isDotty.value) None // No such release yet
-      // else if (System.getenv("SCALAJS_VERSION") == "1.0.0") None
+      // else if (System.getenv("SCALAJS_VERSION") == "1.0.1") None
       else Some("1.3.0")
     },
     mimaBinaryIssueFilters ++= {

jvm/src/test/scala-2.x/scala/xml/CompilerErrors.scala

@@ -5,25 +5,15 @@ import org.junit.Test
 class CompilerErrors extends CompilerTesting {
   @Test
   def t7185() = {
-    // Error message 2.13.1 and earlier:
-    // 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,
-    //  """|object Test {
-    //     |  <e></e>()
-    //     |}""")
-
-    // Error message changed in Scala 2.13.2
-    // https://github.com/scala/scala/pull/8592
-    expectXmlError("overloaded method", // " apply "
-     """|object Test {
-        |  <e></e>()
-        |}""")
-    expectXmlError("""|with alternatives:
-                      |  (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
-                      |  (i: Int)scala.xml.Node
-                      | cannot be applied to ()""".stripMargin,
+    // 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>()
         |}""")