Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Upgrade to Scala 2.10.0-RC5

  • Loading branch information...
commit 76c8a574718d53156b76b67bfea3de8942e948f5 1 parent 303713e
@sirthias sirthias authored
Showing with 13 additions and 2 deletions.
  1. +2 −2 build.sbt
  2. +11 −0 src/test/scala/spray/json/ProductFormatsSpec.scala
View
4 build.sbt
@@ -14,7 +14,7 @@ startYear := Some(2011)
licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-scalaVersion := "2.10.0-RC3"
+scalaVersion := "2.10.0-RC5"
scalacOptions <<= scalaVersion map {
case x if x startsWith "2.9" =>
@@ -37,7 +37,7 @@ scaladocOptions <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " +
// publishing
///////////////
-crossScalaVersions := Seq("2.9.2", "2.10.0-RC3")
+crossScalaVersions := Seq("2.9.2", "2.10.0-RC5")
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)
View
11 src/test/scala/spray/json/ProductFormatsSpec.scala
@@ -84,4 +84,15 @@ class ProductFormatsSpec extends Specification {
}
}
+ "A JsonFormat for a generic case class with an explicitly provided type parameter" should {
+ "support the jsonFormat1 syntax" in {
+ case class Box[A](a: A)
+ object BoxProtocol extends DefaultJsonProtocol {
+ implicit val boxFormat = jsonFormat1(Box[Int])
+ }
+ import BoxProtocol._
+ Box(42).toJson === JsObject(Map("a" -> JsNumber(42)))
+ }
+ }
+
}
Please sign in to comment.
Something went wrong with that request. Please try again.