From e94cd5048d981d4f6b2cd20d8d1c38e91a5fbd21 Mon Sep 17 00:00:00 2001 From: Colin Godsey Date: Tue, 21 Jul 2015 15:05:53 -0500 Subject: [PATCH] v0.2-RC1 --- README.md | 24 ++++++++++++------------ REGISTRY.md | 6 +++--- build.sbt | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 835d88b..5ecc650 100644 --- a/README.md +++ b/README.md @@ -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]] } @@ -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": "" } @@ -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" }] ``` @@ -139,7 +139,7 @@ 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" ``` @@ -147,7 +147,7 @@ and for Scala.js ```scala -libraryDependencies += "com.mediamath" %%% "scala-json" % "colin-SNAPSHOT" +libraryDependencies += "com.mediamath" %%% "scala-json" % "0.2-RC1" ``` diff --git a/REGISTRY.md b/REGISTRY.md index 47a1a03..eabfdfd 100644 --- a/REGISTRY.md +++ b/REGISTRY.md @@ -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" } diff --git a/build.sbt b/build.sbt index 49313b0..74c66cf 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -version in ThisBuild := "colin-SNAPSHOT" +version in ThisBuild := "0.2-RC1" lazy val json = crossProject.in(file(".")) .settings(ScalaJSON.commonSettings: _*)