diff --git a/.travis.yml b/.travis.yml index 1a54e7573..aead3ae98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ jdk: scala: - 2.11.12 - 2.12.8 - - 2.13.0-RC2 + - 2.13.0-RC3 env: global: @@ -29,31 +29,31 @@ env: matrix: # The empty SCALAJS_VERSION will only compile for the JVM - SCALAJS_VERSION= - - SCALAJS_VERSION=0.6.27 - - SCALAJS_VERSION=1.0.0-M7 + - SCALAJS_VERSION=0.6.28 + - SCALAJS_VERSION=1.0.0-M8 matrix: exclude: - jdk: openjdk11 - env: SCALAJS_VERSION=0.6.27 + env: SCALAJS_VERSION=0.6.28 - jdk: openjdk11 - env: SCALAJS_VERSION=1.0.0-M7 + env: SCALAJS_VERSION=1.0.0-M8 - scala: 2.11.12 - env: SCALAJS_VERSION=1.0.0-M7 + env: SCALAJS_VERSION=1.0.0-M8 - scala: 2.11.12 jdk: oraclejdk8 - scala: 2.11.12 jdk: openjdk11 - scala: 2.12.8 jdk: openjdk6 - - scala: 2.13.0-RC2 + - scala: 2.13.0-RC3 jdk: openjdk6 before_script: - nvm install 8 - nvm use 8 -script: +script: # work around https://github.com/travis-ci/travis-ci/issues/9713 - if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi - java -version diff --git a/README.md b/README.md index 9eaf06872..59014b256 100644 --- 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-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) +[![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) [![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/scala/scala-xml) ========= diff --git a/build.sbt b/build.sbt index 97e0e55fd..d4d8dcdfa 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import sbtcrossproject.{crossProject, CrossType} import ScalaModulePlugin._ -crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC2") +crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC3") lazy val xml = crossProject(JSPlatform, JVMPlatform) .withoutSuffixFor(JVMPlatform) @@ -22,7 +22,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) scalacOptions in Test += "-Xxml:coalescing", mimaPreviousVersion := { - Some("1.2.0") + if (System.getenv("SCALAJS_VERSION") == "1.0.0-M8") None // No such release yet + else Some("1.2.0") }, unmanagedSourceDirectories in Compile ++= { diff --git a/project/plugins.sbt b/project/plugins.sbt index 983887349..8fd973271 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ else Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")) val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")