upgrade to new version of uPickle/Ammonite

5 files changed, 19 insertions, 20 deletions

diff --git a/core/src/main/scala/mill/discover/Mirror.scala b/core/src/main/scala/mill/discover/Mirror.scala
index 6293e599..41b3a0fe 100644
--- a/core/src/main/scala/mill/discover/Mirror.scala
+++ b/core/src/main/scala/mill/discover/Mirror.scala
@@ -76,7 +76,10 @@ object Mirror{
   }
 
   def makeTargetPoint[T, V](label: String, func: T => Target[V])
-                (implicit f: upickle.default.ReadWriter[V]) = {
+                (implicit f1: upickle.default.Reader[V],
+                 f2: upickle.default.Writer[V]) = {
+
+    val f = upickle.default.ReadWriter(f2.write, f1.read)
     TargetPoint(label, f, func)
   }
 }
diff --git a/core/src/main/scala/mill/eval/PathRef.scala b/core/src/main/scala/mill/eval/PathRef.scala
index 433e9f5c..784d9ad4 100644
--- a/core/src/main/scala/mill/eval/PathRef.scala
+++ b/core/src/main/scala/mill/eval/PathRef.scala
@@ -5,7 +5,7 @@ import java.nio.file.attribute.BasicFileAttributes
 import java.nio.file.{FileVisitResult, FileVisitor}
 import java.nio.{file => jnio}
 import java.security.MessageDigest
-
+import upickle.default.{ReadWriter => RW}
 import ammonite.ops.Path
 import mill.util.JsonFormatters
 
@@ -63,6 +63,6 @@ case class PathRef(path: ammonite.ops.Path, quick: Boolean = false){
 }
 
 object PathRef{
-  private implicit val pathFormat: upickle.default.ReadWriter[Path] = JsonFormatters.pathReadWrite
-  implicit def jsonFormatter: upickle.default.ReadWriter[PathRef] = upickle.default.macroRW
+  private implicit val pathFormat: RW[Path] = JsonFormatters.pathReadWrite
+  implicit def jsonFormatter: RW[PathRef] = upickle.default.macroRW
 }
diff --git a/core/src/main/scala/mill/util/JsonFormatters.scala b/core/src/main/scala/mill/util/JsonFormatters.scala
index bce23468..d8125ff2 100644
--- a/core/src/main/scala/mill/util/JsonFormatters.scala
+++ b/core/src/main/scala/mill/util/JsonFormatters.scala
@@ -1,28 +1,23 @@
 package mill.util
 
 import ammonite.ops.{Bytes, Path}
-
+import upickle.default.{ReadWriter => RW}
 object JsonFormatters extends JsonFormatters
 trait JsonFormatters {
-  implicit def readWriter[T: upickle.default.Reader: upickle.default.Writer] =
-    upickle.default.ReadWriter(
-      implicitly[upickle.default.Writer[T]].write,
-      implicitly[upickle.default.Reader[T]].read,
-    )
-  implicit val pathReadWrite = upickle.default.ReadWriter[ammonite.ops.Path](
+  implicit val pathReadWrite: RW[ammonite.ops.Path] = RW[ammonite.ops.Path](
     o => upickle.Js.Str(o.toString()),
-    {case upickle.Js.Str(json) => Path(json)},
+    {case upickle.Js.Str(json) => Path(json.toString)},
   )
 
-  implicit val bytesReadWrite = upickle.default.ReadWriter[Bytes](
+  implicit val bytesReadWrite: RW[Bytes] = RW[Bytes](
     o => upickle.Js.Str(javax.xml.bind.DatatypeConverter.printBase64Binary(o.array)),
-    {case upickle.Js.Str(json) => new Bytes(javax.xml.bind.DatatypeConverter.parseBase64Binary(json))}
+    {case upickle.Js.Str(json) => new Bytes(javax.xml.bind.DatatypeConverter.parseBase64Binary(json.toString))}
   )
 
 
-  implicit lazy val crFormat: upickle.default.ReadWriter[ammonite.ops.CommandResult] =
-    upickle.default.macroRW
-  implicit lazy val modFormat: upickle.default.ReadWriter[coursier.Module] = upickle.default.macroRW
-  implicit lazy val depFormat: upickle.default.ReadWriter[coursier.Dependency]= upickle.default.macroRW
-  implicit lazy val attrFormat: upickle.default.ReadWriter[coursier.Attributes] = upickle.default.macroRW
+  implicit lazy val crFormat: RW[ammonite.ops.CommandResult] = upickle.default.macroRW
+
+  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
 }
diff --git a/core/src/test/scala/mill/discover/DiscoveredTests.scala b/core/src/test/scala/mill/discover/DiscoveredTests.scala
index 98a54759..1d0f7a78 100644
--- a/core/src/test/scala/mill/discover/DiscoveredTests.scala
+++ b/core/src/test/scala/mill/discover/DiscoveredTests.scala
@@ -95,7 +95,7 @@ object DiscoveredTests extends TestSuite{
 
         val error = compileError("Discovered[outer.type]")
         assert(
-          error.msg.contains("could not find implicit value"),
+          error.msg.contains("uPickle does not know how to read"),
           error.pos.contains("def single = mill.T{ new InputStreamReader(System.in) }")
         )
       }
diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
index e0a43c6e..7639d8e2 100644
--- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
+++ b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
@@ -9,6 +9,7 @@ import mill.util.Ctx.DestCtx
 import mill.{Module, T}
 import mill.util.{DummyLogger, OSet}
 import utest._
+import mill._
 
 object JavaCompileJarTests extends TestSuite{
   def compileAll(sources: Seq[PathRef])(implicit ctx: DestCtx) = {