diff options
Diffstat (limited to 'main/src/mill/main')
| -rw-r--r-- | main/src/mill/main/MainModule.scala | 3 | ||||
| -rw-r--r-- | main/src/mill/main/RunScript.scala | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/main/src/mill/main/MainModule.scala b/main/src/mill/main/MainModule.scala index a740a2e6..34145668 100644 --- a/main/src/mill/main/MainModule.scala +++ b/main/src/mill/main/MainModule.scala @@ -7,7 +7,6 @@ import mill.define.{NamedTask, Task} import mill.eval.{Evaluator, PathRef, Result} import mill.util.{Ctx, PrintLogger, Watched} import pprint.{Renderer, Truncated} -import upickle.Js object MainModule{ def resolveTasks[T](evaluator: Evaluator, targets: Seq[String], multiSelect: Boolean) (f: List[NamedTask[Any]] => T) = { @@ -17,7 +16,7 @@ object MainModule{ } } def evaluateTasks[T](evaluator: Evaluator, targets: Seq[String], multiSelect: Boolean) - (f: Seq[(Any, Option[Js.Value])] => T) = { + (f: Seq[(Any, Option[ujson.Value])] => T) = { RunScript.evaluateTasks(evaluator, targets, multiSelect) match{ case Left(err) => Result.Failure(err) case Right((watched, Left(err))) => Result.Failure(err, Some(Watched((), watched))) diff --git a/main/src/mill/main/RunScript.scala b/main/src/mill/main/RunScript.scala index 820b1341..119ac2aa 100644 --- a/main/src/mill/main/RunScript.scala +++ b/main/src/mill/main/RunScript.scala @@ -11,7 +11,6 @@ import mill.define._ import mill.eval.{Evaluator, PathRef, Result} import mill.util.{EitherOps, Logger, ParseArgs, Watched} import mill.util.Strict.Agg -import upickle.Js import scala.collection.mutable import scala.reflect.ClassTag @@ -30,7 +29,7 @@ object RunScript{ stateCache: Option[Evaluator.State], log: Logger, env : Map[String, String]) - : (Res[(Evaluator, Seq[PathRef], Either[String, Seq[Js.Value]])], Seq[(os.Path, Long)]) = { + : (Res[(Evaluator, Seq[PathRef], Either[String, Seq[ujson.Value]])], Seq[(os.Path, Long)]) = { val (evalState, interpWatched) = stateCache match{ case Some(s) if watchedSigUnchanged(s.watched) => Res.Success(s) -> s.watched @@ -198,7 +197,7 @@ object RunScript{ } def evaluate(evaluator: Evaluator, - targets: Agg[Task[Any]]): (Seq[PathRef], Either[String, Seq[(Any, Option[upickle.Js.Value])]]) = { + targets: Agg[Task[Any]]): (Seq[PathRef], Either[String, Seq[(Any, Option[ujson.Value])]]) = { val evaluated = evaluator.evaluate(targets) val watched = evaluated.results .iterator @@ -239,7 +238,7 @@ object RunScript{ val jsonFile = Evaluator .resolveDestPaths(evaluator.outPath, t.ctx.segments) .meta - val metadata = upickle.default.readJs[Evaluator.Cached](ujson.read(jsonFile.toIO)) + val metadata = upickle.default.read[Evaluator.Cached](ujson.read(jsonFile.toIO)) Some(metadata.value) case _ => None |