Merge branch 'develop' of https://github.com/MediaMath/scala-json

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,20 +82,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"
 }]
 ```

project/ScalaJSON.scala

@@ -61,7 +61,7 @@ object ScalaJSON {
   def settings(jsonJS: Project, jsonJVM: Project) = baseSettings ++ tut.Plugin.tutSettings ++ Seq(
     publish := {},
     publishLocal := {},
-    crossScalaVersions in ThisBuild := Seq("2.11.4"),//, "2.10.4"),
+    crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.10.4"),
 
     genDocsTask <<= (tut.Plugin.tut, baseDirectory, version) map { (outFiles, baseDir, ver) =>
       for((outFile, _) <- outFiles) {