Merge remote-tracking branch 'origin/1.x' into merge-1.x-to-master-20200915

Author: SethTisue

.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

@@ -41,9 +41,17 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
     scalacOptions in Test  += "-Xxml:coalescing",
 
     scalaModuleMimaPreviousVersion := {
+<<<<<<< HEAD
       if (isDotty.value) None // No such release yet
       // else if (System.getenv("SCALAJS_VERSION") == "1.0.0") None
       else Some("1.3.0")
+||||||| 172ce22
+      if (System.getenv("SCALAJS_VERSION") == "1.0.0") None
+      else Some("1.2.0")
+=======
+      if (System.getenv("SCALAJS_VERSION") == "1.0.1") None
+      else Some("1.2.0")
+>>>>>>> origin/1.x
     },
     mimaBinaryIssueFilters ++= {
       import com.typesafe.tools.mima.core._

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>()
         |}""")