summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 03:23:31 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 03:23:31 -0800
commit7e30d7a37a23173f5a311b0251445468f55c787a (patch)
tree1c997130779897bc442626f35e2cbc970e7af40b
parent4ae7a62a0b31e2335d9372c05ceafda919d87c22 (diff)
downloadmill-7e30d7a37a23173f5a311b0251445468f55c787a.tar.gz
mill-7e30d7a37a23173f5a311b0251445468f55c787a.tar.bz2
mill-7e30d7a37a23173f5a311b0251445468f55c787a.zip
Embed the `MILL_VERSION` to the `releaseAssembly` CLI flags so it knows which version of the various Mill jars it needs to resolve from maven central
-rwxr-xr-xbuild.sc2
-rw-r--r--scalajslib/src/mill/scalajslib/ScalaJSModule.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.sc b/build.sc
index 5e3a9af2..9ae3a1ee 100755
--- a/build.sc
+++ b/build.sc
@@ -197,7 +197,7 @@ def devAssembly = T{
}
def releaseAssembly = T{
- assemblyBase(Agg.from(assemblyClasspath().flatten.map(_.path)), "")
+ assemblyBase(Agg.from(assemblyClasspath().flatten.map(_.path)), "-DMILL_VERSION=" + publishVersion()._2)
}
val isMasterCommit = {
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 2aa750b3..7b6b79f9 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -44,7 +44,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
Seq(Dep(
"com.lihaoyi",
s"mill-jsbridge_${scalaJSBridgeVersion().replace('.', '_')}",
- "0.1-SNAPSHOT"
+ sys.props("MILL_VERSION")
))
).map(_.find(_.path.toString.contains("mill-jsbridge")).get)
}