From e68e7a8444d69225253aafaf0eb4334fa5f0d739 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Tue, 25 Sep 2018 00:19:07 -0400
Subject: [PATCH 1/2] Update Scala.js to 0.6.25 and 1.0.0-M5

---
 .travis.yml         | 8 ++++----
 build.sbt           | 2 +-
 project/plugins.sbt | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 629df76af..81e0dfa6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,15 +29,15 @@ env:
   matrix:
     # The empty SCALAJS_VERSION will only compile for the JVM
     - SCALAJS_VERSION=
-    - SCALAJS_VERSION=0.6.23
-    - SCALAJS_VERSION=1.0.0-M3
+    - SCALAJS_VERSION=0.6.25
+    - SCALAJS_VERSION=1.0.0-M5
 
 matrix:
   exclude:
     - jdk: oraclejdk10
-      env: SCALAJS_VERSION=0.6.23
+      env: SCALAJS_VERSION=0.6.25
     - jdk: oraclejdk10
-      env: SCALAJS_VERSION=1.0.0-M3
+      env: SCALAJS_VERSION=1.0.0-M5
     - scala: 2.11.12
       jdk: oraclejdk8
     - scala: 2.11.12
diff --git a/build.sbt b/build.sbt
index a1b38172d..0d5f75b5f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,7 +19,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
     scalacOptions in Test  += "-Xxml:coalescing",
 
     mimaPreviousVersion := {
-      if (System.getenv("SCALAJS_VERSION") == "1.0.0-M3") None // No such release yet
+      if (System.getenv("SCALAJS_VERSION") == "1.0.0-M5") None // No such release yet
       else Some("1.1.0")
     },
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0670f0eef..62ba94c51 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -6,8 +6,8 @@ else
   Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
 
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.23")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.25")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")

From 57e5dd7176a9b4037a895615eabe0d5820bb4f92 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Tue, 25 Sep 2018 06:33:21 -0400
Subject: [PATCH 2/2] Drop Scala 2.11 for Scalajs 1.0

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 81e0dfa6b..07a3600f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,8 @@ matrix:
       env: SCALAJS_VERSION=0.6.25
     - jdk: oraclejdk10
       env: SCALAJS_VERSION=1.0.0-M5
+    - scala: 2.11.12
+      env: SCALAJS_VERSION=1.0.0-M5
     - scala: 2.11.12
       jdk: oraclejdk8
     - scala: 2.11.12