Skip to content

Commit 41df62f

Browse files
committed
Upgrade Scala and Scala.js.
* Scala 2.12.10 and 2.13.1. * Scala.js 0.6.31, 1.0.0-M8 and 1.0.0-RC1.
1 parent c3b34a1 commit 41df62f

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

.travis.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,20 @@ script:
99
scala:
1010
- 2.10.7
1111
- 2.11.12
12-
- 2.12.6
13-
- 2.13.0-M3
14-
- 2.13.0-M4
12+
- 2.12.10
13+
- 2.13.1
1514
jdk:
1615
- openjdk8
1716
env:
18-
- SCALAJS_VERSION=0.6.24
19-
- SCALAJS_VERSION=1.0.0-M3
20-
- SCALAJS_VERSION=1.0.0-M5
17+
- SCALAJS_VERSION=0.6.31
18+
- SCALAJS_VERSION=1.0.0-M8
19+
- SCALAJS_VERSION=1.0.0-RC1
2120
matrix:
2221
exclude:
2322
- scala: 2.10.7
24-
env: SCALAJS_VERSION=1.0.0-M3
25-
- scala: 2.13.0-M4
26-
env: SCALAJS_VERSION=1.0.0-M3
23+
env: SCALAJS_VERSION=1.0.0-M8
2724
- scala: 2.10.7
28-
env: SCALAJS_VERSION=1.0.0-M5
25+
env: SCALAJS_VERSION=1.0.0-RC1
2926

3027
cache:
3128
directories:

build.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import sbtcrossproject.crossProject
22

33
crossScalaVersions in ThisBuild := {
4-
val allVersions = Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
4+
val allVersions = Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
55
if (scalaJSVersion.startsWith("0.6."))
66
allVersions
7-
else if (scalaJSVersion == "1.0.0-M3")
8-
allVersions.filter(v => !v.startsWith("2.10.") && v != "2.13.0-M4")
97
else
108
allVersions.filter(!_.startsWith("2.10."))
119
}

project/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.24")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
5-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
5+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
66

77
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")

0 commit comments

Comments
 (0)