diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-24 22:05:33 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-25 07:08:54 -0800 |
commit | 11c194da920cd6a4196ddfbb875c0d1faa47fcff (patch) | |
tree | 324e4e4519ba4498ba0a8081c1256fb841603af5 /build.sc | |
parent | fdaf23824b4dd579daafb2de49123bcc5f2e4228 (diff) | |
download | mill-11c194da920cd6a4196ddfbb875c0d1faa47fcff.tar.gz mill-11c194da920cd6a4196ddfbb875c0d1faa47fcff.tar.bz2 mill-11c194da920cd6a4196ddfbb875c0d1faa47fcff.zip |
Migrate `scalajslib` over to a `T.worker` setup similar to `scalalib`
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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" |