Skip to content

Commit d00c5b3

Browse files
committed
Upgrades.
* sbt-crossproject 0.5.0 (to support Scala.js 1.0.0-M5) * Scala.js 0.6.24 and 1.0.0-M5
1 parent 2a04a9d commit d00c5b3

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ jdk:
1717
env:
1818
- SCALAJS_VERSION=0.6.23
1919
- SCALAJS_VERSION=1.0.0-M3
20+
- SCALAJS_VERSION=1.0.0-M5
2021
matrix:
2122
exclude:
2223
- scala: 2.10.7
2324
env: SCALAJS_VERSION=1.0.0-M3
2425
- scala: 2.13.0-M4
2526
env: SCALAJS_VERSION=1.0.0-M3
27+
- scala: 2.10.7
28+
env: SCALAJS_VERSION=1.0.0-M5
2629

2730
cache:
2831
directories:

build.sbt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
import sbtcrossproject.crossProject
22

3-
crossScalaVersions in ThisBuild := Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
3+
crossScalaVersions in ThisBuild := {
4+
val allVersions = Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
5+
if (scalaJSVersion.startsWith("0.6."))
6+
allVersions
7+
else if (scalaJSVersion == "1.0.0-M3")
8+
allVersions.filter(v => !v.startsWith("2.10.") && v != "2.13.0-M4")
9+
else
10+
allVersions.filter(!_.startsWith("2.10."))
11+
}
412
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
513

614
val commonSettings: Seq[Setting[_]] = Seq(

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.23")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.24")
33

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

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

0 commit comments

Comments
 (0)