Skip to content

Commit 2338dca

Browse files
ashawleylrytz
authored andcommitted
Use scala 2.13.0-M4 milestone release
1 parent 9434340 commit 2338dca

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jdk:
1313
scala:
1414
- 2.11.12
1515
- 2.12.4
16-
- 2.13.0-M3
16+
- 2.13.0-M4
1717

1818
env:
1919
global:
@@ -30,11 +30,11 @@ env:
3030

3131
matrix:
3232
exclude:
33-
- scala: 2.13.0-M3
33+
- scala: 2.13.0-M4
3434
env: SCALAJS_VERSION=1.0.0-M3
3535
- scala: 2.12.4
3636
jdk: openjdk6
37-
- scala: 2.13.0-M3
37+
- scala: 2.13.0-M4
3838
jdk: openjdk6
3939

4040
script: admin/build.sh

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ scala-xml
22
[![Travis](https://img.shields.io/travis/scala/scala-xml.svg)](https://travis-ci.org/scala/scala-xml)
33
[![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)
44
[![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)
5-
[![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)
5+
[![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)
66
[![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/scala/scala-xml)
77
=========
88

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sbtcrossproject.{crossProject, CrossType}
22
import ScalaModulePlugin._
33

4-
crossScalaVersions in ThisBuild := List("2.12.6", "2.11.12", "2.13.0-M3")
4+
crossScalaVersions in ThisBuild := List("2.12.6", "2.11.12", "2.13.0-M4")
55

66
lazy val xml = crossProject(JSPlatform, JVMPlatform)
77
.withoutSuffixFor(JVMPlatform)
@@ -27,7 +27,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
2727
(unmanagedSourceDirectories in Compile).value.map { dir =>
2828
val sv = scalaVersion.value
2929
CrossVersion.partialVersion(sv) match {
30-
case Some((2, 13)) if !sv.startsWith("2.13.0-M3") => file(dir.getPath ++ "-2.13") // TODO: remove M3 guard once M4 is out.
30+
case Some((2, 13)) => file(dir.getPath ++ "-2.13")
3131
case _ => file(dir.getPath ++ "-2.11-2.12")
3232
}
3333
}

0 commit comments

Comments
 (0)