diff options
| -rwxr-xr-x | build.sc | 6 | ||||
| -rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 2 | ||||
| -rw-r--r-- | scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -191,8 +191,8 @@ object scalajslib extends MillModule { def testArgs = T{ val mapping = Map( - "MILL_SCALAJS_BRIDGE_0_6" -> worker("0.6").compile().classes.path, - "MILL_SCALAJS_BRIDGE_1_0" -> worker("1.0").compile().classes.path + "MILL_SCALAJS_WORKER_0_6" -> worker("0.6").compile().classes.path, + "MILL_SCALAJS_WORKER_1_0" -> worker("1.0").compile().classes.path ) Seq("-Djna.nosys=true") ++ scalalib.worker.testArgs() ++ @@ -258,7 +258,7 @@ object scalanativelib extends MillModule { def testArgs = T{ val mapping = Map( - "MILL_SCALANATIVE_BRIDGE_0_3" -> + "MILL_SCALANATIVE_WORKER_0_3" -> worker("0.3").runClasspath() .map(_.path) .filter(_.toIO.exists) diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index b3737da1..803543c7 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -27,7 +27,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => def scalaJSBridgeVersion = T{ scalaJSVersion().split('.').dropRight(1).mkString(".") } def sjsBridgeClasspath = T { - val jsBridgeKey = "MILL_SCALAJS_BRIDGE_" + scalaJSBridgeVersion().replace('.', '_') + val jsBridgeKey = "MILL_SCALAJS_WORKER_" + scalaJSBridgeVersion().replace('.', '_') mill.modules.Util.millProjectModule( jsBridgeKey, s"mill-scalajslib-worker-${scalaJSBridgeVersion()}", diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala index b275e6e3..b636f1b4 100644 --- a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala +++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala @@ -68,7 +68,7 @@ trait ScalaNativeModule extends ScalaModule { outer => def bridge = T.task{ ScalaNativeWorkerApi.scalaNativeBridge().bridge(bridgeFullClassPath()) } def scalaNativeBridgeClasspath = T { - val snBridgeKey = "MILL_SCALANATIVE_BRIDGE_" + scalaNativeBinaryVersion().replace('.', '_').replace('-', '_') + val snBridgeKey = "MILL_SCALANATIVE_WORKER_" + scalaNativeBinaryVersion().replace('.', '_').replace('-', '_') val snBridgePath = sys.props(snBridgeKey) if (snBridgePath != null) Result.Success(Agg(snBridgePath.split(',').map(p => PathRef(Path(p), quick = true)): _*)) |