Merge pull request #186 from ashawley/scala-2.13.0-M3

Increment scala to 2.11.12, 2.12.4 and 2.13.0-M3

Author: ashawley

build.sbt

@@ -1,9 +1,9 @@
 import ScalaModulePlugin._
 
 scalaVersionsByJvm in ThisBuild := {
-  val v211 = "2.11.11"
-  val v212 = "2.12.3"
-  val v213 = "2.13.0-M2"
+  val v211 = "2.11.12"
+  val v212 = "2.12.4"
+  val v213 = "2.13.0-M3"
   Map(
     6 -> List(v211 -> true),
     7 -> List(v211 -> false),

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")

shared/src/test/scala/scala/xml/UtilityTest.scala

@@ -18,13 +18,13 @@ class UtilityTest {
                  <toomuchws/>
               </foo>
     val y = xml.Utility.trim(x)
-    assertEquals(1, y match { case <foo><toomuchws/></foo> => 1 })
+    assertTrue(y match { case <foo><toomuchws/></foo> => true })
 
     val x2 = <foo>
       <toomuchws>  a b  b a  </toomuchws>
     </foo>
     val y2 = xml.Utility.trim(x2)
-    assertEquals(2, y2 match { case <foo><toomuchws>a b b a</toomuchws></foo> => 2 })
+    assertTrue(y2 match { case <foo><toomuchws>a b b a</toomuchws></foo> => true })
   }
 
   @Test