build fix, other fixes

Author: colinrgodsey

build.sbt

@@ -1,7 +1,11 @@
 ScalaJSON.settings
 
-lazy val jsonJs = Project("scala-json", file("scalajs"))
+lazy val jsonJs = Project("scala-json-js", file("scalajs"))
     .enablePlugins(ScalaJSPlugin)
     .settings(ScalaJSON.jsSettings: _*)
 
-lazy val json = project.aggregate(jsonJs).settings(ScalaJSON.settings: _*).aggregate(jsonJs)
+lazy val root = Project("scala-json", file(".")).settings(ScalaJSON.settings: _*).aggregate(jsonJs)
+
+version in ThisBuild := "0.1-RC1"
+
+crossScalaVersions in ThisBuild := Seq("2.11.4")//, "2.10.4")

project/ScalaJSON.scala

@@ -25,13 +25,12 @@ object Repository {
 
 object ScalaJSON {
   val commonSettings = Seq(
-    version := "0.1",
+    name := "scala-json",
     scalaVersion := "2.11.5",
     organization := "com.mediamath",
     organizationName := "MediaMath, Inc",
     organizationHomepage := Some(url("http://www.mediamath.com")),
     credentials ++= Repository.userCredentials,
-    publishMavenStyle := true,
     crossPaths := true,
     publishTo := Some("publish" at Repository.globalPublishTo(isSnapshot.value)),
     publishArtifact in Test := false,
@@ -42,7 +41,9 @@ object ScalaJSON {
     libraryDependencies <++= scalaVersion { x =>
       Seq(
         "org.scala-lang" % "scala-reflect" % x,
-        "org.scala-lang" % "scala-compiler" % x
+        "org.scala-lang" % "scala-compiler" % x,
+
+        "com.lihaoyi" %% "utest" % "0.3.0" % "test"
       )
     },
 
@@ -54,13 +55,9 @@ object ScalaJSON {
     testFrameworks += new TestFramework("utest.runner.Framework")
   )
 
-  val settings = commonSettings ++ Seq(
-    name := "scala-json"
-  )
+  val settings = commonSettings
 
   val jsSettings = commonSettings ++ Seq(
-    name := "scala-json",
-
     unmanagedSourceDirectories in Compile +=
         (baseDirectory in ThisBuild).value / "src" / "main" / "scala",
     unmanagedSourceDirectories in Test +=

project/plugins.sbt

@@ -1 +1,8 @@
+resolvers += Resolver.url(
+  "tpolecat-sbt-plugin-releases",
+  url("http://dl.bintray.com/content/tpolecat/sbt-plugin-releases"))(
+      Resolver.ivyStylePatterns)
+
+addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.3.2")
+
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0")

scalajs/src/main/scala/json/JSJValue.scala

@@ -8,7 +8,7 @@ import js.JSConverters._
 object JSJValue {
   def from(v: Any): JValue = v match {
     case x: JValue => x
-    case seq0: js.Array[Any] =>
+    case seq0: js.Array[_] =>
       val seq: Seq[Any] = seq0
       val jvals: Seq[JValue] = seq.map(JSJValue.from)
 

src/main/scala/json/JValue.scala

@@ -41,7 +41,7 @@ object JValue extends Accessors with VMContext.JValueCompanionBase /* extends Ge
 
     val res = deser.mapper.readValue[JValue](str, classOf[JValue])
 
-    deser.reset
+    deser.reset()
 
     res
   }

src/main/scala/json/internal/JSONParser.scala

@@ -67,7 +67,7 @@ class JValueObjectDeserializer extends StdDeserializer[JValue](classOf[JValue])
     deserialize(jp, ctx)
   }
 
-  def reset {
+  def reset() {
     if (valCache.size > maxCacheSizeBeforeFlush)
       valCache = valCache.empty
   }

src/main/scala/json/internal/JValueObjectDeserializer.scala

@@ -31,7 +31,7 @@ abstract class TypedEnumerator[K, T <: Enumerable[K, T]](implicit m: Manifest[T]
 
   trait Value extends Enumerable[K, T] { typed: T =>
     def enumerator = TypedEnumerator.this
-    def acc = acc
+    def acc = acc0
   }
 
   lazy val keyMap = valueMap(_.key)

src/main/scala/json/tools/Enumerable.scala

@@ -3,7 +3,8 @@ package json
 import json.annotations._
 import json.internal.JSONAnnotations.FieldAccessorAnnotation
 
-import org.qirx.littlespec.Specification
+import utest._
+import utest.ExecutionContext.RunNow
 
 import scala.annotation.meta