Skip to content

Commit efba23f

Browse files
committed
Bump Scala version to 2.13.0-M5
1 parent 8598705 commit efba23f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ addons:
1010
scala:
1111
- 2.11.12
1212
- 2.12.6
13-
- 2.13.0-M4
13+
- 2.13.0-M5
1414
jdk:
1515
- openjdk6
1616
- oraclejdk8
@@ -28,7 +28,7 @@ env:
2828
- 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="
2929
matrix:
3030
- SCALAJS_VERSION=
31-
- SCALAJS_VERSION=0.6.23
31+
- SCALAJS_VERSION=0.6.25
3232
- SCALAJS_VERSION=1.0.0-M3
3333

3434
matrix:
@@ -38,14 +38,14 @@ matrix:
3838
scala: 2.12.6
3939

4040
- jdk: openjdk6
41-
scala: 2.13.0-M4
41+
scala: 2.13.0-M5
4242

4343
# ?
4444
- jdk: oraclejdk8
4545
scala: 2.11.12
4646

47-
# 2.13.0-M4 is not available in Scala.js 1.0.0-M3
48-
- scala: 2.13.0-M4
47+
# 2.13.0-M5 is not available in Scala.js 1.0.0-M3
48+
- scala: 2.13.0-M5
4949
env: SCALAJS_VERSION=1.0.0-M3
5050
include:
5151

@@ -72,8 +72,8 @@ matrix:
7272
# | oraclejdk8 | 2.12.6 | jvm | | |
7373
# | oraclejdk8 | 2.12.6 | js | 0.6.23 | |
7474
# | oraclejdk8 | 2.12.6 | js | 1.0.0-M3 | |
75-
# | oraclejdk8 | 2.13.0-M4 | jvm | | |
76-
# | oraclejdk8 | 2.13.0-M4 | js | 0.6.23 | |
75+
# | oraclejdk8 | 2.13.0-M5 | jvm | | |
76+
# | oraclejdk8 | 2.13.0-M5 | js | 0.6.23 | |
7777
# | oraclejdk8 | 2.12.6 | jvm | | true |
7878

7979
before_script: ./checkCLA.sh

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.
3131

3232
lazy val scala211 = "2.11.12"
3333
lazy val scala212 = "2.12.6"
34-
lazy val scalaJs213 = "2.13.0-M4" // Scala.js does no have -pre
34+
lazy val scalaJs213 = "2.13.0-M5" // Scala.js does no have -pre
3535

36-
lazy val scala213 = "2.13.0-M4"
36+
lazy val scala213 = "2.13.0-M5"
3737
// lazy val scala213 = "2.13.0-pre-3ae6282" // use the sbt command `latest-213` to fetch the latest version
3838

3939
lazy val scala213Settings = Seq(

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ else
55
// see https://github.com/scala/sbt-scala-module/issues/35
66
Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
77

8-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.23")
8+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.25")
99

1010
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1111
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")

0 commit comments

Comments
 (0)