summaryrefslogtreecommitdiff
path: root/scalalib/src
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-17 18:35:23 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-17 18:35:23 -0800
commit059fe1e763504c37527a8ca5206bf9319e88355b (patch)
tree22e092477464f9c472383af9431a9663cea320fa /scalalib/src
parentaa58cc6d5195f1ce688e53e5cb21576ec7854434 (diff)
downloadmill-059fe1e763504c37527a8ca5206bf9319e88355b.tar.gz
mill-059fe1e763504c37527a8ca5206bf9319e88355b.tar.bz2
mill-059fe1e763504c37527a8ca5206bf9319e88355b.zip
properly pass through failures from scalaworker maven resolution failures
Diffstat (limited to 'scalalib/src')
-rw-r--r--scalalib/src/mill/scalalib/ScalaWorkerApi.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
index 5b7aaa04..4cec0696 100644
--- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
+++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
@@ -14,14 +14,14 @@ import mill.util.JsonFormatters._
object ScalaWorkerApi extends mill.define.ExternalModule {
def scalaWorkerClasspath = T{
val scalaWorkerJar = sys.props("MILL_SCALA_WORKER")
- if (scalaWorkerJar != null) Loose.Agg.from(scalaWorkerJar.split(',').map(Path(_)))
- else {
- val mill.eval.Result.Success(v) = resolveDependencies(
+ if (scalaWorkerJar != null) {
+ mill.eval.Result.Success(Loose.Agg.from(scalaWorkerJar.split(',').map(Path(_))))
+ } else {
+ resolveDependencies(
Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")),
"2.12.4",
Seq(ivy"com.lihaoyi::mill-scalaworker:${sys.props("MILL_VERSION")}")
- )
- v.map(_.path)
+ ).map(_.map(_.path))
}
}
def scalaWorker: Worker[ScalaWorkerApi] = T.worker{