upgrade to 1.6.3 scala-js

Author: colinrgodsey

README.md

@@ -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]]
 }
@@ -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": ""
 }
 
@@ -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
@@ -120,15 +120,15 @@ SBT
 resolvers += "mmreleases" at
     "https://artifactory.mediamath.com/artifactory/libs-release-global"
 
-libraryDependencies += "com.mediamath" %% "scala-json" % "0.1-RC4"
+libraryDependencies += "com.mediamath" %% "scala-json" % "0.1-RC5"
 
 ```
 
 and for Scala.js
 
 ```scala
 
-libraryDependencies += "com.mediamath" %%% "scala-json" % "0.1-RC4"
+libraryDependencies += "com.mediamath" %%% "scala-json" % "0.1-RC5"
 
 ```
 

js/src/test/scala/json/JSTest.scala

@@ -43,7 +43,7 @@ object JSTest extends TestSuite {
       )
       val parsed = (NativeJSON parse """[1,2,{},[],{"a":1},"",null,5.123]""").asInstanceOf[js.Array[js.Dynamic]]
 
-      parsed.push(emptyArray))
+      parsed.push(emptyArray)
 
       val reserd = JValue from parsed
 

project/ScalaJSON.scala

@@ -31,8 +31,10 @@ object Repository {
   val snapshotRepo = "snapshots" at Repository.snapshots
   val releaseRepo = "releases" at Repository.releases
 
+  val globalSuffix = "" //"-global"
+
   def repo(isSnapshot: Boolean) = if (isSnapshot) Repository.snapshots else Repository.releases
-  def globalPublishTo(isSnapshot: Boolean) = repo(isSnapshot) + "-global"
+  def globalPublishTo(isSnapshot: Boolean) = repo(isSnapshot) + globalSuffix
   def userCredentials = (Path.userHome / ".ivy2" / "credentials" ** "*").filter(_.isFile).get.map(Credentials(_))
 }
 

project/plugins.sbt

@@ -5,4 +5,4 @@ resolvers += Resolver.url(
 
 addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.3.2")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.3")