Skip to content

support Scala 2.13.0-RC3 (drop RC2) #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2019
Merged

support Scala 2.13.0-RC3 (drop RC2) #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c75ba
support Scala 2.13.0-RC3 (drop RC2)
SethTisue May 29, 2019
af1120b
restore MiMa exemption temporarily
SethTisue May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jdk:

scala:
- 2.12.8
- 2.13.0-RC2
- 2.13.0-RC3
- 0.15.0-RC1

env:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
=========

Expand Down
5 changes: 3 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ++= {
Expand Down Expand Up @@ -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._
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down