1 files changed, 2 insertions, 41 deletions
diff --git a/main/core/src/mill/util/JsonFormatters.scala b/main/core/src/mill/util/JsonFormatters.scala
index dba599f7..830782c6 100644
--- a/main/core/src/mill/util/JsonFormatters.scala
+++ b/main/core/src/mill/util/JsonFormatters.scala
@@ -1,49 +1,10 @@
 package mill.util
 
 import upickle.default.{ReadWriter => RW}
-import scala.util.matching.Regex
-object JsonFormatters extends JsonFormatters
-trait JsonFormatters {
-  implicit val pathReadWrite: RW[os.Path] = upickle.default.readwriter[String]
-    .bimap[os.Path](
-      _.toString,
-      os.Path(_)
-    )
-
-  implicit val regexReadWrite: RW[Regex] = upickle.default.readwriter[String]
-    .bimap[Regex](
-      _.pattern.toString,
-      _.r
-    )
-
-  implicit val bytesReadWrite: RW[os.Bytes] = upickle.default.readwriter[String]
-    .bimap(
-      o => java.util.Base64.getEncoder.encodeToString(o.array),
-      str => new os.Bytes(java.util.Base64.getDecoder.decode(str))
-    )
-
-
-  implicit lazy val crFormat: RW[os.CommandResult] = upickle.default.macroRW
 
+trait JsonFormatters extends mill.api.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[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: ujson.Obj =>
-      new StackTraceElement(
-        json("declaringClass").str.toString,
-        json("methodName").str.toString,
-        json("fileName").str.toString,
-        json("lineNumber").num.toInt
-      )
-    }
-  )
-
-
 }
+object JsonFormatters extends JsonFormatters