Skip to content

Commit 9d351e6

Browse files
committed
Upgrades.
* Scala 2.12.8 and 2.13.0-RC1 * Scala.js 0.6.27 and 1.0.0-M7
1 parent ef1f303 commit 9d351e6

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,21 @@ language: scala
33
script:
44
- sbt ++$TRAVIS_SCALA_VERSION package doc example/compile
55
- sbt scalafmtTest
6-
- sbt ++2.11.11 readme/run
6+
- sbt ++2.11.12 readme/run
77
scala:
88
- 2.10.7
99
- 2.11.12
10-
- 2.12.6
11-
- 2.13.0-M3
12-
- 2.13.0-M4
10+
- 2.12.8
11+
- 2.13.0-RC1
1312
jdk:
1413
- oraclejdk8
1514
env:
16-
- SCALAJS_VERSION=0.6.23
17-
- SCALAJS_VERSION=1.0.0-M3
15+
- SCALAJS_VERSION=0.6.27
16+
- SCALAJS_VERSION=1.0.0-M7
1817
matrix:
1918
exclude:
2019
- scala: 2.10.7
21-
env: SCALAJS_VERSION=1.0.0-M3
22-
- scala: 2.13.0-M4
23-
env: SCALAJS_VERSION=1.0.0-M3
20+
env: SCALAJS_VERSION=1.0.0-M7
2421

2522
cache:
2623
directories:

build.sbt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ lazy val root = project.in(file(".")).
66
name := "Scala.js DOM"
77

88
crossScalaVersions in ThisBuild := {
9-
if (scalaJSVersion.startsWith("1.")) Seq("2.12.6", "2.11.12", "2.13.0-M3")
10-
else Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
9+
if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0-RC1")
10+
else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC1")
1111
}
1212
scalaVersion in ThisBuild := crossScalaVersions.value.head
1313

@@ -38,8 +38,7 @@ scalacOptions ++= {
3838
def hasNewCollections(version: String): Boolean = {
3939
!version.startsWith("2.10.") &&
4040
!version.startsWith("2.11.") &&
41-
!version.startsWith("2.12.") &&
42-
version != "2.13.0-M3"
41+
!version.startsWith("2.12.")
4342
}
4443

4544
/** Returns the appropriate subdirectory of `sourceDir` depending on whether

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55

0 commit comments

Comments
 (0)