From af65cfdad7de0bb25971e424638c0cc47170341b Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Wed, 31 Jan 2018 22:08:46 -0500
Subject: [PATCH 1/3] Increment scala to 2.11.12, 2.12.4 and 2.13.0-M3

---
 build.sbt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index 99388d132..2cacdc18f 100644
--- a/build.sbt
+++ b/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),

From fb4e4e8e6fa195106bc347543f0ddacbfbc3115c Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Wed, 31 Jan 2018 22:23:25 -0500
Subject: [PATCH 2/3] Update scala-js to 0.6.20 to fix 2.13.0-M3

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5b07efadc..ddba7a8b5 100644
--- a/project/plugins.sbt
+++ b/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")

From ac9f76993416004f357ef94b87d1b40c34c85700 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Thu, 1 Feb 2018 19:19:46 -0500
Subject: [PATCH 3/3] Improve UtilityTest.trim

Also fixes defect in scalajs 0.6.22 and scala 2.13.0-M3
---
 shared/src/test/scala/scala/xml/UtilityTest.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/src/test/scala/scala/xml/UtilityTest.scala b/shared/src/test/scala/scala/xml/UtilityTest.scala
index eac05075b..263740266 100644
--- a/shared/src/test/scala/scala/xml/UtilityTest.scala
+++ b/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