Use scala 2.13.0-M4 milestone release

scala · May 23, 2018 · c01ec90 · c01ec90
1 parent 2c90a3f
commit c01ec90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ jdk:
 scala:
   - 2.11.12
   - 2.12.4
-  - 2.13.0-M3
+  - 2.13.0-M4
 
 env:
   global:
@@ -30,11 +30,11 @@ env:
 
 matrix:
   exclude:
-    - scala: 2.13.0-M3
+    - scala: 2.13.0-M4
       env: SCALAJS_VERSION=1.0.0-M3
     - scala: 2.12.4
       jdk: openjdk6
-    - scala: 2.13.0-M3
+    - scala: 2.13.0-M4
       jdk: openjdk6
 
 script:

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@ scala-xml
 [![Travis](https://img.shields.io/travis/scala/scala-xml.svg)](https://travis-ci.org/scala/scala-xml)
 [![latest release for 2.11](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_2.11.svg?label=scala+2.11)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.11)
 [![latest release for 2.12](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_2.12.svg?label=scala+2.12)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.12)
-[![latest release for 2.13.0-M3](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_2.13.0-M3.svg?label=scala+2.13.0-M3)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.13.0-M3)
+[![latest release for 2.13.0-M4](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_2.13.0-M4.svg?label=scala+2.13.0-M4)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.13.0-M4)
 [![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/scala/scala-xml)
 =========
 

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 import sbtcrossproject.{crossProject, CrossType}
 import ScalaModulePlugin._
 
-crossScalaVersions in ThisBuild := List("2.12.6", "2.11.12", "2.13.0-M3")
+crossScalaVersions in ThisBuild := List("2.12.6", "2.11.12", "2.13.0-M4")
 
 lazy val xml = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
@@ -19,15 +19,15 @@ 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-M4") None // No such release yet
       else Some("1.1.0")
     },
 
     unmanagedSourceDirectories in Compile ++= {
       (unmanagedSourceDirectories in Compile).value.map { dir =>
         val sv = scalaVersion.value
         CrossVersion.partialVersion(sv) match {
-          case Some((2, 13)) if !sv.startsWith("2.13.0-M3") => file(dir.getPath ++ "-2.13") // TODO: remove M3 guard once M4 is out.
+          case Some((2, 13)) => file(dir.getPath ++ "-2.13")
           case _             => file(dir.getPath ++ "-2.11-2.12")
         }
       }