scala 2.12 still has macro issue. scala-native still has test issue.

Author: colinrgodsey

js/src/test/scala/json/ExportTest.scala

@@ -20,7 +20,7 @@ import scala.scalajs.js.annotation.JSExport
 import scalajs.js
 
 import utest._
-import utest.ExecutionContext.RunNow
+import utest.framework.ExecutionContext.RunNow
 
 class ExportTest extends js.JSApp {
   @JSExport

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

@@ -31,7 +31,7 @@ object JSTest extends TestSuite {
     assert(JSJValue.from(x) == result)
   }
 
-  val tests = TestSuite("test JS" - {
+  val tests = this("test JS" - {
     "test native JSON" - {
       val str = Tester.testJSON2
       val native = NativeJSON.parse(str)

jvm/src/test/scala/json/JVMJSONTest.scala

@@ -18,11 +18,10 @@ package json
 
 import json.internal.PrimitiveJArray
 import utest._
-import utest.framework.TestSuite
 
 class JVMJSONTest extends TestSuite {
 
-  val tests = TestSuite {
+  val tests = this {
     "use primitive arrays" - {
       val arrJS = JArray(JTrue, JFalse, JTrue).toString
       val parsed = JValue.fromString(arrJS).jArray

native/src/main/scala/json/internal/JanssonDeserializer.scala

@@ -19,6 +19,7 @@ package json.internal
 import scalanative.native
 
 import janssonConstants._
+import janssonTypes._
 import jansson._
 import native._
 import json._

native/src/main/scala/json/internal/jansson.scala

@@ -23,25 +23,7 @@ import Nat._
 @native.link("jansson")
 @native.extern
 object jansson {
-  type JSON_ERROR_TEXT_LENGTH = Digit[_1, Digit[_6, _0]]
-  type JSON_ERROR_SOURCE_LENGTH = Digit[_8, _0]
-
-  type json_type = CInt //enum
-
-  type json_error_t = CStruct5[
-      CInt, //line
-      CInt, //column
-      CInt, //position,
-      CArray[CChar, JSON_ERROR_SOURCE_LENGTH], //source
-      CArray[CChar, JSON_ERROR_TEXT_LENGTH] //text
-  ]
-
-  type json_t = CStruct2[
-      json_type, //type
-      CSize //refcount
-  ]
-
-  type json_iter = Ptr[Byte]
+  import janssonTypes._
 
   def json_loads(input: CString, flags: CSize, error: Ptr[json_error_t]): Ptr[json_t] = extern
 
@@ -70,6 +52,28 @@ object jansson {
   def json_string_value(str: Ptr[json_t]): CString = extern
 }
 
+object janssonTypes {
+  type JSON_ERROR_TEXT_LENGTH = Digit[_1, Digit[_6, _0]]
+  type JSON_ERROR_SOURCE_LENGTH = Digit[_8, _0]
+
+  type json_type = CInt //enum
+
+  type json_error_t = CStruct5[
+      CInt, //line
+      CInt, //column
+      CInt, //position,
+      CArray[CChar, JSON_ERROR_SOURCE_LENGTH], //source
+      CArray[CChar, JSON_ERROR_TEXT_LENGTH] //text
+      ]
+
+  type json_t = CStruct2[
+      json_type, //type
+      CSize //refcount
+      ]
+
+  type json_iter = Ptr[Byte]
+}
+
 object janssonConstants {
   //json_type
   val JSON_OBJECT  = 0

project/ScalaJSON.scala

@@ -53,7 +53,7 @@ object ScalaJSON {
     organizationName := "MediaMath, Inc",
     organizationHomepage := Some(url("http://www.mediamath.com")),
     crossPaths := true,
-    crossScalaVersions := Seq("2.10.6", targetScalaVer, "2.12.0-M3"),
+    crossScalaVersions := Seq("2.10.6", targetScalaVer, "2.12.1"),
     resolvers += Resolver.sonatypeRepo("releases"),
     addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
   )
@@ -107,10 +107,7 @@ object ScalaJSON {
       </developers>
     },
 
-    //temporary resolver for colinrgodsey fork of [email protected] for 2.12.0-M3 support
-    resolvers += "mvn repo" at "https://raw.githubusercontent.com/colinrgodsey/maven/master",
-
-    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.3.1" % "test",
+    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.5" % "test",
 
     testFrameworks += new TestFramework("utest.runner.Framework")
   )

project/plugins.sbt

@@ -6,6 +6,6 @@ resolvers += Resolver.url(
 addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.3.2")
 
 addSbtPlugin("org.scala-js"     % "sbt-scalajs"              % "0.6.14")
-addSbtPlugin("org.scala-native" % "sbt-crossproject"         % "0.1.0")  // (1)
-addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.1.0")  // (2)
-addSbtPlugin("org.scala-native" % "sbt-scala-native"         % "0.1.0")  // (3)
+addSbtPlugin("org.scala-native" % "sbt-crossproject"         % "0.1.0")
+addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.1.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native"         % "0.1.0")

shared/src/main/scala-2.12.0-M3/json/internal/CompileTimeOnly.scala renamed to shared/src/main/scala-2.12/json/internal/CompileTimeOnly.scala

@@ -184,10 +184,7 @@ object ObjectAccessorFactory {
       val nameConversion = nameConversionAnno.headOption match {
         case None => reify {s: String => s}.tree
         case Some(anno) =>
-          println(showRaw(anno))
           val outTree = anno.tree.children.tail.head
-          println(showRaw(outTree))
-          println(show(outTree))
           outTree
       }
       val nameConversionExpr = c.Expr[String => String](nameConversion)
@@ -214,16 +211,15 @@ object ObjectAccessorFactory {
 
       val objMfExpr = classExpr(typ0)
 
-      val memberAnnos = (for {
-        mem <- typ0.members
-        anno <- mem.annotations
-        if anno.tree.tpe <:< typeOf[JSONAnnotation]
-      } yield mem.name -> anno) ++ (for {
-        paramSet <- applyMethod.paramLists
-        param <- paramSet
-        anno <- param.annotations
+      val memberSymbols: Iterable[Symbol] =
+        typ0.members ++ applyMethod.paramLists.flatten ++
+            typ0.decls ++ typ0.companion.paramLists.flatten
+
+      val memberAnnos = for {
+        sym <- memberSymbols
+        anno <- sym.annotations
         if anno.tree.tpe <:< typeOf[JSONAnnotation]
-      } yield param.name -> anno)
+      } yield sym.name -> anno
 
       //scan for annotations that show we should use a
       //different field name

shared/src/main/scala/json/internal/ObjectAccessorFactory.scala

@@ -19,7 +19,6 @@ package json
 
 import json.internal.PrimitiveJArray
 import json.tools.{TypedEnumerator, Enumerator}
-import utest.framework.TestSuite
 import utest._
 
 import scala.annotation.meta
@@ -37,23 +36,23 @@ object Tester extends TestSuite {
     implicit val acc = ObjectAccessor.create[TestObject3]
   }
 
-  object TestObject2 {
-    implicit val acc = ObjectAccessor.create[TestObject2]
-  }
   case class TestObject2(a: String, b: String, qqq: Double = 2.456,
       c: String = "ddddd", d: Option[String] = Some("XXXX"),
       @name(field = "aa11") @Tester.NumAnno(11) ffff: Option[String] = None,
       @name(field = "zzz2") zzz: Map[String, TestObject3] = Map("asfa" ->
           TestObject3("", 0.5, 4)),
       seqa: Seq[Int] = Nil,
       blah: Int = 123)
-
-  object TestObject {
-    implicit val acc = ObjectAccessor.create[TestObject]
+  object TestObject2 {
+    implicit val acc = ObjectAccessor.create[TestObject2]
   }
+
   case class TestObject(a: String,
       @name(field = "BLAH") b: String,
       c: Int, d: TestObject2)
+  object TestObject {
+    implicit val acc = ObjectAccessor.create[TestObject]
+  }
 
   trait TestTrait {
     def num: Int
@@ -106,7 +105,7 @@ object Tester extends TestSuite {
   def testJSONEqual(jv: JValue) =
     assert(JValue.fromString(jv.toString) == jv)
 
-  val tests = TestSuite {
+  val tests = this {
     "JSON accessor should" - {
       val test3 = TestObject3("", 0.5, 4)
       val test2 = TestObject2("sdfsdg", "dfdfd")