From c0c75ba3a4ea2b5b863786e32585528634490c2a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 29 May 2019 21:50:17 +0200 Subject: [PATCH 1/2] support Scala 2.13.0-RC3 (drop RC2) --- .travis.yml | 16 ++++++++-------- README.md | 2 +- build.sbt | 2 +- project/plugins.sbt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13cde04cd..9401fdafb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: scala: - 2.12.8 - - 2.13.0-RC2 + - 2.13.0-RC3 - 0.15.0-RC1 env: @@ -20,21 +20,21 @@ 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: 0.15.0-RC1 - env: SCALAJS_VERSION=0.6.27 + env: SCALAJS_VERSION=0.6.28 - scala: 0.15.0-RC1 - env: SCALAJS_VERSION=1.0.0-M7 + env: SCALAJS_VERSION=1.0.0-M8 -script: +script: - admin/build.sh before_cache: diff --git a/README.md b/README.md index f17c1947d..6a3d1c824 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 590bb9d18..b04f80405 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import sbtcrossproject.CrossType import sbtcrossproject.CrossPlugin.autoImport.crossProject import ScalaModulePlugin._ -crossScalaVersions in ThisBuild := List("2.12.8", "2.13.0-RC2") +crossScalaVersions in ThisBuild := List("2.12.8", "2.13.0-RC3") lazy val configSettings: Seq[Setting[_]] = Seq( unmanagedSourceDirectories ++= { diff --git a/project/plugins.sbt b/project/plugins.sbt index 3d7dda9d8..0d0418e6d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5") 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") From af1120bd404317ec6ecea57f951b5fb791b49461 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 29 May 2019 23:00:41 +0200 Subject: [PATCH 2/2] restore MiMa exemption temporarily --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b04f80405..f47b6fb3a 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,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") }, mimaBinaryIssueFilters ++= { import com.typesafe.tools.mima.core._