Skip to content

Commit

Permalink
rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
colinrgodsey committed Mar 10, 2015
1 parent 5051687 commit 0594633
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ scala> def testMap = Map("hey" -> "there")
testMap: scala.collection.immutable.Map[String,String]

scala> val testMapJs = testMap.js
testMapJs: json.JObject =
testMapJs: json.JObject =
{
"hey": "there"
}

scala> Map("key" -> Seq.fill(3)(Set(Some(false), None))).js
res4: json.JObject =
res4: json.JObject =
{
"key": [[false, null], [false, null], [false, null]]
}
Expand Down Expand Up @@ -66,9 +66,9 @@ scala> implicit val acc = ObjectAccessor.of[TestClass]
acc: json.CaseClassObjectAccessor[TestClass] = ObjectAccessor[TestClass]

scala> val testClassJs = TestClass(1, None).js
testClassJs: json.JObject =
testClassJs: json.JObject =
{
"a": 1,
"a": 1,
"c": ""
}

Expand All @@ -82,21 +82,21 @@ scala> JObject("a".js -> 23.js).toObject[TestClass]
res11: TestClass = TestClass(23,None,,None)

scala> TestClass(1, None).js + ("blah".js -> 1.js) - "a"
res12: json.JValue =
res12: json.JValue =
{
"c": "",
"c": "",
"blah": 1
}

scala> Seq(TestClass(1, None), TestClass(1, Some(10), c = "hihi")).js
res13: json.JArray =
res13: json.JArray =
[{
"a": 1,
"c": ""
"a": 1,
"c": ""
}, {
"a": 1,
"b": 10,
"c": "hihi"
"a": 1,
"b": 10,
"c": "hihi"
}]
```
* Typed exceptions with field data
Expand All @@ -120,15 +120,15 @@ SBT
resolvers += "mmreleases" at
"https://artifactory.mediamath.com/artifactory/libs-release-global"

libraryDependencies += "com.mediamath" %% "scala-json" % "0.1-RC3"
libraryDependencies += "com.mediamath" %% "scala-json" % "0.1-RC4"

```

and for Scala.js

```scala

libraryDependencies += "com.mediamath" %%% "scala-json" % "0.1-RC3"
libraryDependencies += "com.mediamath" %%% "scala-json" % "0.1-RC4"

```

2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version in ThisBuild := "0.1-RC3"
version in ThisBuild := "0.1-RC4"

lazy val json = crossProject.in(file("."))
.settings(ScalaJSON.commonSettings: _*)
Expand Down

0 comments on commit 0594633

Please sign in to comment.