From 21026c2c858a58681fdeb1a194629ce693730890 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 22 Aug 2018 21:17:09 +0800 Subject: fix build --- docs/VisualizeCompile.svg | 48 +++++++++++----------- readme.md | 2 +- scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 4 +- .../mill/scalanativelib/ScalaNativeModule.scala | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/VisualizeCompile.svg b/docs/VisualizeCompile.svg index 73b3d04f..a74cdb42 100644 --- a/docs/VisualizeCompile.svg +++ b/docs/VisualizeCompile.svg @@ -237,63 +237,63 @@ - + -scalajslib.jsbridges[0.6].compile +scalajslib.worker[0.6].compile -scalajslib.jsbridges[0.6].compile +scalajslib.worker[0.6].compile - + -scalajslib.jsbridges[0.6].compile->scalajslib.compile +scalajslib.worker[0.6].compile->scalajslib.compile - + -scalajslib.jsbridges[0.6].test.compile +scalajslib.worker[0.6].test.compile -scalajslib.jsbridges[0.6].test.compile +scalajslib.worker[0.6].test.compile - + -scalajslib.jsbridges[0.6].test.compile->main.test.compile +scalajslib.worker[0.6].test.compile->main.test.compile - + -scalajslib.jsbridges[0.6].test.compile->scalajslib.jsbridges[0.6].compile +scalajslib.worker[0.6].test.compile->scalajslib.worker[0.6].compile - + -scalajslib.jsbridges[1.0].compile +scalajslib.worker[1.0].compile -scalajslib.jsbridges[1.0].compile +scalajslib.worker[1.0].compile - + -scalajslib.jsbridges[1.0].compile->scalajslib.compile +scalajslib.worker[1.0].compile->scalajslib.compile - + -scalajslib.jsbridges[1.0].test.compile +scalajslib.worker[1.0].test.compile -scalajslib.jsbridges[1.0].test.compile +scalajslib.worker[1.0].test.compile - + -scalajslib.jsbridges[1.0].test.compile->main.test.compile +scalajslib.worker[1.0].test.compile->main.test.compile - + -scalajslib.jsbridges[1.0].test.compile->scalajslib.jsbridges[1.0].compile +scalajslib.worker[1.0].test.compile->scalajslib.worker[1.0].compile diff --git a/readme.md b/readme.md index 3e1b57f1..d943c31c 100644 --- a/readme.md +++ b/readme.md @@ -137,7 +137,7 @@ dev) and load into isolated classloaders. ### Worker modules that are resolved from Maven Central -- `scalalib.worker`, `scalajslib.jsbridges[0.6]`, `scalajslib.jsbridges[1.0]` +- `scalalib.worker`, `scalajslib.worker[0.6]`, `scalajslib.worker[1.0]` These modules are where the heavy-lifting happens, and include heavy dependencies like the Scala compiler, Scala.js optimizer, etc.. Rather than diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 00963f00..8f0e7da9 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -30,9 +30,9 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => val jsBridgeKey = "MILL_SCALAJS_BRIDGE_" + scalaJSBridgeVersion().replace('.', '_') mill.modules.Util.millProjectModule( jsBridgeKey, - s"mill-scalajslib-jsbridges-${scalaJSBridgeVersion()}", + s"mill-scalajslib-worker-${scalaJSBridgeVersion()}", repositories, - resolveFilter = _.toString.contains("mill-scalajslib-jsbridges") + resolveFilter = _.toString.contains("mill-scalajslib-worker") ) } diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala index d3cde4d1..2ede1e4c 100644 --- a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala +++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala @@ -76,7 +76,7 @@ trait ScalaNativeModule extends ScalaModule { outer => Lib.resolveDependencies( Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), Lib.depToDependency(_, "2.12.4", ""), - Seq(ivy"com.lihaoyi::mill-scalanativelib-scalanativebridges-${scalaNativeBinaryVersion()}:${sys.props("MILL_VERSION")}") + Seq(ivy"com.lihaoyi::mill-scalanativelib-worker-${scalaNativeBinaryVersion()}:${sys.props("MILL_VERSION")}") ) } -- cgit v1.2.3