From 11c194da920cd6a4196ddfbb875c0d1faa47fcff Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 24 Jan 2018 22:05:33 -0800 Subject: Migrate `scalajslib` over to a `T.worker` setup similar to `scalalib` --- build.sc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 489ef126..5bb7030e 100755 --- a/build.sc +++ b/build.sc @@ -134,18 +134,17 @@ object scalajslib extends MillModule { def moduleDeps = Seq(scalalib) - def bridgeClasspath(runDepClasspath: Agg[PathRef], classes: PathRef) = - (runDepClasspath ++ Agg(classes)).map(_.path).mkString(File.pathSeparator) def testArgs = T{ val mapping = Map( - "MILL_SCALAJS_BRIDGE_0_6" -> bridgeClasspath(jsbridges("0.6").runDepClasspath(), jsbridges("0.6").compile().classes), - "MILL_SCALAJS_BRIDGE_1_0" -> bridgeClasspath(jsbridges("1.0").runDepClasspath(), jsbridges("1.0").compile().classes) + "MILL_SCALAJS_BRIDGE_0_6" -> jsbridges("0.6").compile().classes.path, + "MILL_SCALAJS_BRIDGE_1_0" -> jsbridges("1.0").compile().classes.path ) scalaworker.testArgs() ++ (for((k, v) <- mapping.toSeq) yield s"-D$k=$v") } object jsbridges extends Cross[JsBridgeModule]("0.6", "1.0") class JsBridgeModule(scalajsBinary: String) extends MillModule{ + def moduleDeps = Seq(scalajslib) val scalajsVersion = scalajsBinary match { case "0.6" => "0.6.21" case "1.0" => "1.0.0-M2" -- cgit v1.2.3