Skip to content

Commit a784ceb

Browse files
authored
Merge pull request #315 from SethTisue/rc3
support Scala 2.13.0-RC3 (drop RC2)
2 parents 59ff6c0 + 0c53c45 commit a784ceb

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jdk:
1616
scala:
1717
- 2.11.12
1818
- 2.12.8
19-
- 2.13.0-RC2
19+
- 2.13.0-RC3
2020

2121
env:
2222
global:
@@ -29,31 +29,31 @@ env:
2929
matrix:
3030
# The empty SCALAJS_VERSION will only compile for the JVM
3131
- SCALAJS_VERSION=
32-
- SCALAJS_VERSION=0.6.27
33-
- SCALAJS_VERSION=1.0.0-M7
32+
- SCALAJS_VERSION=0.6.28
33+
- SCALAJS_VERSION=1.0.0-M8
3434

3535
matrix:
3636
exclude:
3737
- jdk: openjdk11
38-
env: SCALAJS_VERSION=0.6.27
38+
env: SCALAJS_VERSION=0.6.28
3939
- jdk: openjdk11
40-
env: SCALAJS_VERSION=1.0.0-M7
40+
env: SCALAJS_VERSION=1.0.0-M8
4141
- scala: 2.11.12
42-
env: SCALAJS_VERSION=1.0.0-M7
42+
env: SCALAJS_VERSION=1.0.0-M8
4343
- scala: 2.11.12
4444
jdk: oraclejdk8
4545
- scala: 2.11.12
4646
jdk: openjdk11
4747
- scala: 2.12.8
4848
jdk: openjdk6
49-
- scala: 2.13.0-RC2
49+
- scala: 2.13.0-RC3
5050
jdk: openjdk6
5151

5252
before_script:
5353
- nvm install 8
5454
- nvm use 8
5555

56-
script:
56+
script:
5757
# work around https://github.com/travis-ci/travis-ci/issues/9713
5858
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
5959
- java -version

README.md

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 2 deletions
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.8", "2.11.12", "2.13.0-RC2")
4+
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC3")
55

66
lazy val xml = crossProject(JSPlatform, JVMPlatform)
77
.withoutSuffixFor(JVMPlatform)
@@ -22,7 +22,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
2222
scalacOptions in Test += "-Xxml:coalescing",
2323

2424
mimaPreviousVersion := {
25-
Some("1.2.0")
25+
if (System.getenv("SCALAJS_VERSION") == "1.0.0-M8") None // No such release yet
26+
else Some("1.2.0")
2627
},
2728

2829
unmanagedSourceDirectories in Compile ++= {

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ else
66
Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
77

88
val scalaJSVersion =
9-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")
9+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
1010

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

0 commit comments

Comments
 (0)