Skip to content

Commit

Permalink
release 3.2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
casualjim committed Oct 23, 2014
1 parent ebc76d7 commit 59355f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions ast/src/main/scala/org/json4s/JsonDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ trait JsonDSL extends Implicits {
val l: JValue = left._2
JObject(JField(left._1, l) :: right.obj)
}
def ~~[B <% JValue](right: (String, B)) = ~(right)
def ~~(right: JObject) = ~(right)
def ~~[B <% JValue](right: (String, B)) = this.~(right)
def ~~(right: JObject) = this.~(right)

}

class JsonListAssoc(left: List[JField]) {
def ~(right: (String, JValue)) = JObject(left ::: List(JField(right._1, right._2)))
def ~(right: JObject) = JObject(left ::: right.obj)
def ~~(right: (String, JValue)) = ~(right)
def ~~(right: JObject) = ~(right)
def ~~(right: (String, JValue)) = this.~(right)
def ~~(right: JObject) = this.~(right)
}
}
2 changes: 1 addition & 1 deletion project/build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ object build extends Build {
scalaVersion := "2.9.3",
crossScalaVersions := Seq("2.9.1", "2.9.1-1", "2.9.2", "2.9.3"),
scalacOptions ++= Seq("-unchecked", "-deprecation", "-optimize"),
version := "3.2.11-SNAPSHOT",
version := "3.2.11",
javacOptions ++= Seq("-target", "1.6", "-source", "1.6"),
manifestSetting,
publishSetting,
Expand Down

0 comments on commit 59355f5

Please sign in to comment.