diff --git a/.travis.yml b/.travis.yml index ac074334..2b7b094c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: scala scala: - 2.11.12 - 2.12.8 - - 2.13.0-RC1 + - 2.13.0-RC3 jdk: - oraclejdk8 - openjdk11 @@ -18,8 +18,8 @@ env: - secure: "m0Fw/eH7RXJJoBTfqV6CMd7kaIN2pRPnQPNXJGb546UjqYAlYTkfjvVrWpsgpisRBptI1FEHn24yGbgAHjIes/4un/O62K66I0BffL8PbdeHeNcDjSrTesKEqage2mQfGOiqccVsmkgiKeXNYL8tPZRmPQQ3XZ97mS1SXWlqAJSMW6HfNnvqW14Gdb/snR6I8lQ2o5tRnLerWPnI96pp+xjZca2lD4XDvH2wLJXXLmYY61e23ZYzZMepxBxhGa7js3YTYzCWNrOfBLjFJ5nwRxbjR0WMuz5z5Gdy715WtguKS4Fffd/GJHycLROBU9LCAQDMTxMFvqzFqVFpfq0BuTmmkXFXj+a7dO+ABG0RfoDfoMjn7pHwyHNCZyMMuR1HCjMkbGFwC+Zme2UAYNivtcsuWWeMuypwjyqjfFfNns4FHJ0SXFtC/6+OJkAuUdbEJKReYWKWEsP5SnCH/8PLlc+uUl3tjQkFLc1sOAyx9cTWyBErwuJXhgTrjT9AWvO+fvhcm8z/p5+aaF/U9GIrzPqziX4hGjzc/WC+rsFJSiBDlFQl7br+m8WWs7/wuXqPGXmhf0BNQViDi7fZndDHcY3p3T0An05d/IMKjCUrgLDlJi6VYs9XN7S8ay6MH+XTwIsJGSxtGjfEO4rHGIjtR2GRr8TqdNfnpsI3ucbia1Y=" matrix: - 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: diff --git a/README.md b/README.md index 4dd2eedd..69a7e6b0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To use this library, add the following to your build.sbt: libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.0.0" ``` -Version 2.0.0 is compatible with Scala 2.13.0-RC2, 2.12 and 2.11. +Version 2.0.0 is compatible with Scala 2.13, 2.12, and 2.11. Note that there are multiple ways to cross-build projects, see https://github.com/scala/collection-strawman/wiki/FAQ#how-do-i-cross-build-my-project-against-scala-212-and-scala-213. diff --git a/build.sbt b/build.sbt index 9fbfa872..b5cdd3cb 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0. lazy val scala211 = "2.11.12" lazy val scala212 = "2.12.8" -lazy val scala213 = "2.13.0-RC2" +lazy val scala213 = "2.13.0-RC3" scalaVersionsByJvm in ThisBuild := { val all = List(scala211, scala212, scala213) diff --git a/project/plugins.sbt b/project/plugins.sbt index 244a1baa..983c7f0b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27") +val scalaJSVersion = 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")