Skip to content

Commit 23fde69

Browse files
authored
Merge pull request #211 from SethTisue/rc3
support Scala 2.13.0-RC3 (drop RC2)
2 parents 7bfeae9 + aedfcc6 commit 23fde69

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: scala
33
scala:
44
- 2.11.12
55
- 2.12.8
6-
- 2.13.0-RC1
6+
- 2.13.0-RC3
77
jdk:
88
- oraclejdk8
99
- openjdk11
@@ -18,8 +18,8 @@ env:
1818
- 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="
1919
matrix:
2020
- SCALAJS_VERSION=
21-
- SCALAJS_VERSION=0.6.27
22-
- SCALAJS_VERSION=1.0.0-M7
21+
- SCALAJS_VERSION=0.6.28
22+
- SCALAJS_VERSION=1.0.0-M8
2323

2424
matrix:
2525

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ To use this library, add the following to your build.sbt:
1111
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.0.0"
1212
```
1313

14-
Version 2.0.0 is compatible with Scala 2.13.0-RC2, 2.12 and 2.11.
14+
Version 2.0.0 is compatible with Scala 2.13, 2.12, and 2.11.
1515

1616
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.
1717

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.
4545

4646
lazy val scala211 = "2.11.12"
4747
lazy val scala212 = "2.12.8"
48-
lazy val scala213 = "2.13.0-RC2"
48+
lazy val scala213 = "2.13.0-RC3"
4949

5050
scalaVersionsByJvm in ThisBuild := {
5151
val all = List(scala211, scala212, scala213)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")
1+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
22

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

0 commit comments

Comments
 (0)