Merge pull request #129 from sbt/1.0.x

Merge 1.0.x
sbt · Oct 2, 2017 · f4eadfc · f4eadfc
2 parents be73dc0 + 6bad6ae
commit f4eadfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 import Util._
 //import com.typesafe.tools.mima.core._, ProblemFilters._
 
-def baseVersion = "1.0.0-SNAPSHOT"
+def baseVersion = "1.0.2-SNAPSHOT"
 def internalPath = file("internal")
 
 def commonSettings: Seq[Setting[_]] = Seq(

diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala b/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala
@@ -42,8 +42,13 @@ trait JValueFormats { self: sjsonnew.BasicJsonProtocol =>
     }
   }
 
+  // This passes through JValue, or returns JNull instead of blowing up with unimplemented.
   implicit lazy val JValueJsonReader: JR[JValue] = new JR[JValue] {
-    def read[J](j: Option[J], u: Unbuilder[J]) = ??? // Is this even possible? with no Manifest[J]?
+    def read[J](j: Option[J], u: Unbuilder[J]) = j match {
+      case Some(x: JValue) => x
+      case Some(x)         => sys.error(s"Uknown AST $x")
+      case _               => JNull
+    }
   }
 
   implicit lazy val JValueFormat: JF[JValue] =