Skip to content

Commit 564728d

Browse files
committed
added support for sjs 1.0.0-M1
1 parent f917ee8 commit 564728d

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ scala:
1111
- 2.11.11
1212
- 2.12.2
1313
- 2.13.0-M1
14+
env:
15+
- SCALAJS_VERSION=0.6.18
16+
- SCALAJS_VERSION=1.0.0-M1
1417
matrix:
1518
include:
1619
- scala: 2.10.6

project/build.sbt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
2+
val scalaJSVersion =
3+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
4+
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
6+
17
addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
38
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.8.0")
4-
addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.0")
5-
addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0")
9+
addSbtPlugin({
10+
if (scalaJSVersion.startsWith("0.6."))
11+
"org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0"
12+
else
13+
"org.scala-native" % "sbt-crossproject" % "0.2.0"
14+
})
615
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.1")

0 commit comments

Comments
 (0)