Skip to content

Commit

Permalink
v0.2-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
colinrgodsey committed Jul 21, 2015
1 parent 3140bf9 commit e94cd50
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,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 @@ -79,9 +79,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 @@ -95,20 +95,20 @@ 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,
"a": 1,
"c": ""
}, {
"a": 1,
"b": 10,
"a": 1,
"b": 10,
"c": "hihi"
}]
```
Expand Down Expand Up @@ -139,15 +139,15 @@ SBT
resolvers += "mmreleases" at
"https://artifactory.mediamath.com/artifactory/libs-release-global"

libraryDependencies += "com.mediamath" %% "scala-json" % "colin-SNAPSHOT"
libraryDependencies += "com.mediamath" %% "scala-json" % "0.2-RC1"

```

and for Scala.js

```scala

libraryDependencies += "com.mediamath" %%% "scala-json" % "colin-SNAPSHOT"
libraryDependencies += "com.mediamath" %%% "scala-json" % "0.2-RC1"

```

6 changes: 3 additions & 3 deletions REGISTRY.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ scala> val inst = TestClass(1, None)
inst: TestClass = TestClass(1,None,,None)

scala> val jv = inst.js(AccessorRegistry.anyAccessor)
jv: json.JObject =
jv: json.JObject =
{
"data": {
"a": 1,
"a": 1,
"c": ""
},
},
"clazz": "TestClass"
}

Expand Down
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 := "colin-SNAPSHOT"
version in ThisBuild := "0.2-RC1"

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

0 comments on commit e94cd50

Please sign in to comment.