From 059fe1e763504c37527a8ca5206bf9319e88355b Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 17 Feb 2018 18:35:23 -0800 Subject: properly pass through failures from scalaworker maven resolution failures --- scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scalalib/src') 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{ -- cgit v1.2.3