diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 21:46:31 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 22:01:52 -0800 |
commit | 4014f989b5bbea2737bb2b7125410115041a6a6a (patch) | |
tree | 42296e94dc6886aedfcbaf0e6de219b8c9f0a7c0 /scalajslib/src | |
parent | fcbb9c9fd65211d6d5ac40333528fa059c947d0a (diff) | |
download | mill-4014f989b5bbea2737bb2b7125410115041a6a6a.tar.gz mill-4014f989b5bbea2737bb2b7125410115041a6a6a.tar.bz2 mill-4014f989b5bbea2737bb2b7125410115041a6a6a.zip |
- Fix UpickleTests' JS case when running forked
- Shard out forked/local integration tests over the different `test-mill-*.sh` scripts, to try and reduce test times while maintaining coverage
Diffstat (limited to 'scalajslib/src')
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index e3c04c55..a94b287d 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -37,14 +37,14 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => val jsBridgeKey = "MILL_SCALAJS_BRIDGE_" + scalaJSBridgeVersion().replace('.', '_') val jsBridgePath = sys.props(jsBridgeKey) if (jsBridgePath != null) Success( - PathRef(Path(jsBridgePath), quick = true) + Agg(PathRef(Path(jsBridgePath), quick = true)) ) else resolveDependencies( Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), "2.12.4", Seq( ivy"com.lihaoyi::mill-scalajslib-jsbridges-${scalaJSBridgeVersion()}:${sys.props("MILL_VERSION")}" ) - ).map(_.find(_.path.toString.contains("mill-scalajslib-jsbridges")).get) + ).map(_.filter(_.path.toString.contains("mill-scalajslib-jsbridges"))) } def scalaJSLinkerClasspath: T[Loose.Agg[PathRef]] = T{ @@ -63,7 +63,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => ) } - def toolsClasspath = T { Agg(sjsBridgeClasspath()) ++ scalaJSLinkerClasspath() } + def toolsClasspath = T { sjsBridgeClasspath() ++ scalaJSLinkerClasspath() } def fastOpt = T { link( |