Skip to content

Commit c8723f5

Browse files
committed
Explicitly use sbt-scalajs-crossproject.
This will be required for compatibility with Scala.js 1.0.0-M2.
1 parent 1092ca7 commit c8723f5

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import sbtcrossproject.crossProject
2+
13
crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M2")
24
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
35

@@ -56,7 +58,7 @@ lazy val root: Project = project.in(file(".")).
5658
pomIncludeRepository := { _ => false }
5759
)
5860

59-
lazy val testSuite = crossProject.
61+
lazy val testSuite = crossProject(JSPlatform, JVMPlatform).
6062
jsConfigure(_ .enablePlugins(ScalaJSJUnitPlugin)).
6163
settings(commonSettings: _*).
6264
settings(

project/build.sbt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@ val scalaJSVersion =
33

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

6+
{
7+
if (scalaJSVersion != "1.0.0-M1")
8+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
9+
else
10+
Nil
11+
}
12+
613
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")

0 commit comments

Comments
 (0)