circe

Author: xuwei-k

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2018 Viktor Taranenko, Kenji Yoshida and scalapb-argonaut contributors
+Copyright (c) 2016 - 2018 Viktor Taranenko, Kenji Yoshida and scalapb-circe contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,5 @@
-# scalapb-argonaut [![Build Status](https://travis-ci.org/scalapb-json/scalapb-argonaut.svg?branch=master)](https://travis-ci.org/scalapb-json/scalapb-argonaut)
-[![scaladoc](https://javadoc-badge.appspot.com/com.github.scalapb-json/scalapb-argonaut_2.12.svg?label=scaladoc)](https://javadoc-badge.appspot.com/com.github.scalapb-json/scalapb-argonaut_2.12/scalapb_argonaut/index.html?javadocio=true)
+# scalapb-circe [![Build Status](https://travis-ci.org/scalapb-json/scalapb-circe.svg?branch=master)](https://travis-ci.org/scalapb-json/scalapb-circe)
+[![scaladoc](https://javadoc-badge.appspot.com/com.github.scalapb-json/scalapb-circe_2.12.svg?label=scaladoc)](https://javadoc-badge.appspot.com/com.github.scalapb-json/scalapb-circe_2.12/scalapb_circe/index.html?javadocio=true)
 
 The structure of this project is hugely inspired by [scalapb-json4s](https://github.com/scalapb/scalapb-json4s)
 
@@ -8,13 +8,13 @@ The structure of this project is hugely inspired by [scalapb-json4s](https://git
 Include in your `build.sbt` file
 
 ```scala
-libraryDependencies += "io.github.scalapb-json" %% "scalapb-argonaut" % "0.1.0"
+libraryDependencies += "io.github.scalapb-json" %% "scalapb-circe" % "0.1.0"
 ```
 
 for scala-js
 
 ```scala
-libraryDependencies += "io.github.scalapb-json" %%% "scalapb-argonaut" % "0.1.0"
+libraryDependencies += "io.github.scalapb-json" %%% "scalapb-circe" % "0.1.0"
 ```
 
 ## Usage

build.sbt

@@ -15,7 +15,7 @@ val tagOrHash = Def.setting {
 
 val unusedWarnings = Seq("-Ywarn-unused", "-Ywarn-unused-import")
 
-val scalapbArgonaut = crossProject(JVMPlatform, JSPlatform)
+val scalapbCirce = crossProject(JVMPlatform, JSPlatform)
   .in(file("."))
   .settings(
     commonSettings
@@ -63,22 +63,22 @@ lazy val commonSettings = Seq[Def.SettingsDefinition](
   description := "Json/Protobuf convertors for ScalaPB",
   licenses += ("MIT", url("https://opensource.org/licenses/MIT")),
   organization := "io.github.scalapb-json",
-  name := UpdateReadme.scalapbArgonautName,
+  name := UpdateReadme.scalapbCirceName,
   Project.inConfig(Test)(sbtprotoc.ProtocPlugin.protobufConfigSettings),
   PB.targets in Compile := Nil,
   PB.protoSources in Test := Seq(file("shared/src/test/protobuf")),
   libraryDependencies ++= Seq(
     "io.github.scalapb-json" %%% "scalapb-json-common" % "0.1.0",
     "com.trueaccord.scalapb" %%% "scalapb-runtime" % scalapbVersion % "protobuf,test",
-    "io.argonaut" %%% "argonaut" % "6.2.1",
+    "io.circe" %%% "circe-parser" % "0.9.0",
     "org.scalatest" %%% "scalatest" % "3.0.4" % "test"
   ),
   pomExtra in Global := {
-    <url>https://github.com/scalapb-json/scalapb-argonaut</url>
+    <url>https://github.com/scalapb-json/scalapb-circe</url>
       <scm>
-        <connection>scm:git:github.com/scalapb-json/scalapb-argonaut.git</connection>
-        <developerConnection>scm:git:git@github.com:scalapb-json/scalapb-argonaut.git</developerConnection>
-        <url>github.com/scalapb-json/scalapb-argonaut.git</url>
+        <connection>scm:git:github.com/scalapb-json/scalapb-circe.git</connection>
+        <developerConnection>scm:git:git@github.com:scalapb-json/scalapb-circe.git</developerConnection>
+        <url>github.com/scalapb-json/scalapb-circe.git</url>
         <tag>{tagOrHash.value}</tag>
       </scm>
       <developers>
@@ -101,7 +101,7 @@ lazy val commonSettings = Seq[Def.SettingsDefinition](
       "-sourcepath",
       (baseDirectory in LocalRootProject).value.getAbsolutePath,
       "-doc-source-url",
-      s"https://github.com/scalapb-json/scalapb-argonaut/tree/${t}€{FILE_PATH}.scala"
+      s"https://github.com/scalapb-json/scalapb-circe/tree/${t}€{FILE_PATH}.scala"
     )
   },
   ReleasePlugin.extraReleaseCommands,
@@ -133,5 +133,5 @@ lazy val commonSettings = Seq[Def.SettingsDefinition](
   )
 ).flatMap(_.settings)
 
-val scalapbArgonautJVM = scalapbArgonaut.jvm
-val scalapbArgonautJS = scalapbArgonaut.js
+val scalapbCirceJVM = scalapbCirce.jvm
+val scalapbCirceJS = scalapbCirce.js

js/src/main/scala/com/google/protobuf/TextFormat.scala

@@ -1,3 +1,3 @@
-package scalapb_argonaut
+package scalapb_circe
 
 trait JavaAssertionsPlatform

js/src/test/scala/scalapb_argonaut/JavaAssertionsPlatform.scala js/src/test/scala/scalapb_circe/JavaAssertionsPlatform.scala

@@ -1,4 +1,4 @@
-package scalapb_argonaut
+package scalapb_circe
 
 import com.google.protobuf.any.{Any => PBAny}
 import org.scalatest.{FlatSpec, MustMatchers}

jvm/src/test/scala/scalapb_argonaut/AnyFormatSpecJVM.scala jvm/src/test/scala/scalapb_circe/AnyFormatSpecJVM.scala

@@ -1,4 +1,4 @@
-package scalapb_argonaut
+package scalapb_circe
 
 import com.google.protobuf.util.JsonFormat.{TypeRegistry => JavaTypeRegistry}
 import com.trueaccord.scalapb.{
@@ -26,7 +26,7 @@ trait JavaAssertionsPlatform {
     val javaJson = JavaJsonPrinter.print(
       cmp.asInstanceOf[JavaProtoSupport[T, com.google.protobuf.GeneratedMessageV3]].toJavaProto(v))
 
-    import argonaut.JsonParser.parse
+    import io.circe.parser.parse
     parse(scalaJson).isRight must be(true)
     parse(scalaJson) must be(parse(javaJson))
     ScalaJsonParser.fromJsonString[T](scalaJson) must be(v)

jvm/src/test/scala/scalapb_argonaut/JavaAssertionsPlatform.scala jvm/src/test/scala/scalapb_circe/JavaAssertionsPlatform.scala

@@ -1,4 +1,4 @@
-package scalapb_argonaut
+package scalapb_circe
 
 import org.scalatest.{FlatSpec, MustMatchers, OptionValues}
 import jsontest.test._

jvm/src/test/scala/scalapb_argonaut/JsonFormatSpecJVM.scala jvm/src/test/scala/scalapb_circe/JsonFormatSpecJVM.scala

@@ -1,4 +1,4 @@
-package scalapb_argonaut
+package scalapb_circe
 
 import org.scalatest.{FlatSpec, MustMatchers}
 import com.google.protobuf.struct._

jvm/src/test/scala/scalapb_argonaut/StructFormatSpecJVM.scala jvm/src/test/scala/scalapb_circe/StructFormatSpecJVM.scala

@@ -4,13 +4,13 @@ import sbtrelease.Git
 
 object UpdateReadme {
 
-  val scalapbArgonautName = "scalapb-argonaut"
+  val scalapbCirceName = "scalapb-circe"
 
   val updateReadmeTask = { state: State =>
     val extracted = Project.extract(state)
     val v = extracted get version
     val org =  extracted get organization
-    val modules = scalapbArgonautName :: Nil
+    val modules = scalapbCirceName :: Nil
     val readme = "README.md"
     val readmeFile = file(readme)
     val newReadme = Predef.augmentString(IO.read(readmeFile)).lines.map{ line =>

project/UpdateReadme.scala

@@ -1,7 +1,7 @@
-package scalapb_argonaut
+package scalapb_circe
 
 import com.google.protobuf.any.{Any => PBAny}
-import argonaut._
+import io.circe._
 import scala.language.existentials
 import scalapb_json._
 
@@ -19,9 +19,9 @@ object AnyFormat {
       val message = any.unpack(cmp)
 
       // ... and add the @type marker to the resulting JSON
-      printer.toJson(message).obj match {
+      printer.toJson(message).asObject match {
         case Some(fields) =>
-          Json.obj(("@type" -> Json.jString(any.typeUrl)) :: fields.toList: _*)
+          Json.obj(("@type" -> Json.fromString(any.typeUrl)) :: fields.toList: _*)
         case value =>
           // Safety net, this shouldn't happen
           throw new IllegalStateException(
@@ -30,9 +30,9 @@ object AnyFormat {
   }
 
   val anyParser: (Parser, Json) => PBAny = { case (parser, json) =>
-    json.obj match {
+    json.asObject match {
       case Some(obj) =>
-        obj.toMap.get("@type").flatMap(_.string) match {
+        obj.toMap.get("@type").flatMap(_.asString) match {
           case Some(typeUrl) =>
             val cmp = parser.typeRegistry
               .findType(typeUrl)