Skip to content

Commit 19f53ad

Browse files
authored
Merge pull request #318 from ashawley/rc3
support Scala 2.13.0-RC3 (drop RC2)
2 parents 00f3dab + af1120b commit 19f53ad

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.travis.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jdk:
66

77
scala:
88
- 2.12.8
9-
- 2.13.0-RC2
9+
- 2.13.0-RC3
1010
- 0.15.0-RC1
1111

1212
env:
@@ -20,21 +20,21 @@ env:
2020
matrix:
2121
# The empty SCALAJS_VERSION will only compile for the JVM
2222
- SCALAJS_VERSION=
23-
- SCALAJS_VERSION=0.6.27
24-
- SCALAJS_VERSION=1.0.0-M7
23+
- SCALAJS_VERSION=0.6.28
24+
- SCALAJS_VERSION=1.0.0-M8
2525

2626
matrix:
2727
exclude:
2828
- jdk: openjdk11
29-
env: SCALAJS_VERSION=0.6.27
29+
env: SCALAJS_VERSION=0.6.28
3030
- jdk: openjdk11
31-
env: SCALAJS_VERSION=1.0.0-M7
31+
env: SCALAJS_VERSION=1.0.0-M8
3232
- scala: 0.15.0-RC1
33-
env: SCALAJS_VERSION=0.6.27
33+
env: SCALAJS_VERSION=0.6.28
3434
- scala: 0.15.0-RC1
35-
env: SCALAJS_VERSION=1.0.0-M7
35+
env: SCALAJS_VERSION=1.0.0-M8
3636

37-
script:
37+
script:
3838
- admin/build.sh
3939

4040
before_cache:

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-RC2](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_2.13.0-RC2.svg?label=scala+2.13.0-RC2)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.13.0-RC2)
5+
[![latest release for 2.13.0-RC3](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_2.13.0-RC3.svg?label=scala+2.13.0-RC3)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.13.0-RC3)
66
[![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/scala/scala-xml)
77
=========
88

build.sbt

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbtcrossproject.CrossType
22
import sbtcrossproject.CrossPlugin.autoImport.crossProject
33
import ScalaModulePlugin._
44

5-
crossScalaVersions in ThisBuild := List("2.12.8", "2.13.0-RC2")
5+
crossScalaVersions in ThisBuild := List("2.12.8", "2.13.0-RC3")
66

77
lazy val configSettings: Seq[Setting[_]] = Seq(
88
unmanagedSourceDirectories ++= {
@@ -50,7 +50,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
5050
scalacOptions in Test += "-Xxml:coalescing",
5151

5252
mimaPreviousVersion := {
53-
Some("1.2.0")
53+
if (System.getenv("SCALAJS_VERSION") == "1.0.0-M8") None // No such release yet
54+
else Some("1.2.0")
5455
},
5556
mimaBinaryIssueFilters ++= {
5657
import com.typesafe.tools.mima.core._

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")
22

33
val scalaJSVersion =
4-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")
4+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
55

66
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
77
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

0 commit comments

Comments
 (0)