From c7385346bc25c636ee46fe6567eafae65249ae1f Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 18 Nov 2018 21:18:13 +0800
Subject: bump Ammonite version

---
 main/core/src/mill/eval/Evaluator.scala      |  3 +--
 main/core/src/mill/util/JsonFormatters.scala | 15 +++++++--------
 main/src/mill/main/MainModule.scala          |  3 +--
 main/src/mill/main/RunScript.scala           |  7 +++----
 4 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'main')

diff --git a/main/core/src/mill/eval/Evaluator.scala b/main/core/src/mill/eval/Evaluator.scala
index 563d7b63..2aafdb7a 100644
--- a/main/core/src/mill/eval/Evaluator.scala
+++ b/main/core/src/mill/eval/Evaluator.scala
@@ -11,7 +11,6 @@ import mill.eval.Result.OuterStack
 import mill.util
 import mill.util._
 import mill.util.Strict.Agg
-import upickle.Js
 
 import scala.collection.mutable
 import scala.util.control.NonFatal
@@ -346,7 +345,7 @@ case class Evaluator(home: os.Path,
 
 
 object Evaluator{
-  case class Cached(value: Js.Value,
+  case class Cached(value: ujson.Value,
                     valueHash: Int,
                     inputsHash: Int)
   object Cached{
diff --git a/main/core/src/mill/util/JsonFormatters.scala b/main/core/src/mill/util/JsonFormatters.scala
index e2c3073f..dba599f7 100644
--- a/main/core/src/mill/util/JsonFormatters.scala
+++ b/main/core/src/mill/util/JsonFormatters.scala
@@ -1,6 +1,5 @@
 package mill.util
 
-import upickle.Js
 import upickle.default.{ReadWriter => RW}
 import scala.util.matching.Regex
 object JsonFormatters extends JsonFormatters
@@ -29,14 +28,14 @@ trait JsonFormatters {
   implicit lazy val modFormat: RW[coursier.Module] = upickle.default.macroRW
   implicit lazy val depFormat: RW[coursier.Dependency]= upickle.default.macroRW
   implicit lazy val attrFormat: RW[coursier.Attributes] = upickle.default.macroRW
-  implicit val stackTraceRW = upickle.default.readwriter[Js.Obj].bimap[StackTraceElement](
-    ste => Js.Obj(
-      "declaringClass" -> Js.Str(ste.getClassName),
-      "methodName" -> Js.Str(ste.getMethodName),
-      "fileName" -> Js.Str(ste.getFileName),
-      "lineNumber" -> Js.Num(ste.getLineNumber)
+  implicit val stackTraceRW = upickle.default.readwriter[ujson.Obj].bimap[StackTraceElement](
+    ste => ujson.Obj(
+      "declaringClass" -> ujson.Str(ste.getClassName),
+      "methodName" -> ujson.Str(ste.getMethodName),
+      "fileName" -> ujson.Str(ste.getFileName),
+      "lineNumber" -> ujson.Num(ste.getLineNumber)
     ),
-    {case json: Js.Obj =>
+    {case json: ujson.Obj =>
       new StackTraceElement(
         json("declaringClass").str.toString,
         json("methodName").str.toString,
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
-- 
cgit v1.2.3