summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorNikolay Tatarinov <5min4eq.unity@gmail.com>2018-02-01 22:07:39 +0300
committerGitHub <noreply@github.com>2018-02-01 22:07:39 +0300
commit5be2c5aea4527cf637948e6bf2e4c56e3273fbd9 (patch)
tree38d9c675c68ac7505708f182170589119453db21 /build.sbt
parentbc777b3c4e83149f45df7edda245868e22495eb3 (diff)
downloadmill-5be2c5aea4527cf637948e6bf2e4c56e3273fbd9.tar.gz
mill-5be2c5aea4527cf637948e6bf2e4c56e3273fbd9.tar.bz2
mill-5be2c5aea4527cf637948e6bf2e4c56e3273fbd9.zip
WIP: Scala js testing (#119)
fixes #102. Use scala js testing framework to launch tests
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt28
1 files changed, 23 insertions, 5 deletions
diff --git a/build.sbt b/build.sbt
index 837397a4..c3be03d9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -152,7 +152,10 @@ lazy val scalalib = project
pluginSettings,
name := "mill-scalalib",
fork := true,
- baseDirectory in Test := (baseDirectory in Test).value / ".."
+ baseDirectory in Test := (baseDirectory in Test).value / "..",
+ libraryDependencies ++= Seq(
+ "org.scala-sbt" % "test-interface" % "1.0"
+ )
)
lazy val scalaworker: Project = project
@@ -163,8 +166,7 @@ lazy val scalaworker: Project = project
name := "mill-scalaworker",
fork := true,
libraryDependencies ++= Seq(
- "org.scala-sbt" %% "zinc" % "1.0.5",
- "org.scala-sbt" % "test-interface" % "1.0"
+ "org.scala-sbt" %% "zinc" % "1.0.5"
)
)
@@ -204,10 +206,25 @@ def jsbridge(binary: String, version: String) =
organization := "com.lihaoyi",
scalaVersion := "2.12.4",
name := "mill-js-bridge",
- libraryDependencies ++= Seq("org.scala-js" %% "scalajs-tools" % version)
+ libraryDependencies ++= Seq(
+ "org.scala-js" %% "scalajs-tools" % version,
+ "org.scala-js" %% "scalajs-sbt-test-adapter" % version
+ )
+ )
+
+lazy val scalajsbridge_0_6 = jsbridge("0.6", "0.6.22")
+ .settings(
+ libraryDependencies ++= Seq(
+ "org.scala-js" %% "scalajs-js-envs" % "0.6.22"
+ )
)
-lazy val scalajsbridge_0_6 = jsbridge("0.6", "0.6.21")
+
lazy val scalajsbridge_1_0 = jsbridge("1.0", "1.0.0-M2")
+ .settings(
+ libraryDependencies ++= Seq(
+ "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M2"
+ )
+ )
javaOptions in (scalajslib, Test) := jsbridgeProps.value.toSeq ++ scalaWorkerProps.value
@@ -275,6 +292,7 @@ lazy val bin = project
baseDirectory in (Test, run) := (baseDirectory in (Compile, run)).value / ".." / "..",
javaOptions in (Test, run) := {
(javaOptions in (scalalib, Compile)).value ++
+ jsbridgeProps.value.toSeq ++
scalaWorkerProps.value
},
assemblyOption in assembly := {