Merge pull request #9 from andyscott/switch-to-circe-derivation

Switch from circe-generic to circe-derivation
scalameta · Jun 18, 2018 · 9f2a912 · 9f2a912
2 parents 98b4925 + f09c889
commit 9f2a912
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -66,6 +66,7 @@ lazy val V = new {
   val scala212 = "2.12.6"
   val enumeratum = "1.5.12"
   val circe = "0.9.0"
+  val circeDerivation = "0.9.0-M4"
   val cats = "1.0.1"
   val monix = "2.3.0"
 }
@@ -81,8 +82,7 @@ lazy val jsonrpc = project
       "com.beachape" %% "enumeratum-circe" % "1.5.15",
       "com.lihaoyi" %% "pprint" % "0.5.3",
       "io.circe" %% "circe-core" % V.circe,
-      "io.circe" %% "circe-generic" % V.circe,
-      "io.circe" %% "circe-generic-extras" % V.circe,
+      "io.circe" %% "circe-derivation" % V.circeDerivation,
       "io.circe" %% "circe-parser" % V.circe,
       "io.monix" %% "monix" % V.monix,
       "org.typelevel" %% "cats-core" % V.cats

diff --git a/jsonrpc/src/main/scala/scala/meta/jsonrpc/CancelParams.scala b/jsonrpc/src/main/scala/scala/meta/jsonrpc/CancelParams.scala
@@ -1,6 +1,6 @@
 package scala.meta.jsonrpc
 
 import io.circe.Json
-import io.circe.generic.JsonCodec
+import io.circe.derivation.JsonCodec
 
 @JsonCodec case class CancelParams(id: Json)
diff --git a/jsonrpc/src/main/scala/scala/meta/jsonrpc/ErrorObject.scala b/jsonrpc/src/main/scala/scala/meta/jsonrpc/ErrorObject.scala
@@ -1,7 +1,7 @@
 package scala.meta.jsonrpc
 
 import io.circe.Json
-import io.circe.generic.JsonCodec
+import io.circe.derivation.JsonCodec
 
 @JsonCodec case class ErrorObject(
     code: ErrorCode,

diff --git a/jsonrpc/src/main/scala/scala/meta/jsonrpc/Message.scala b/jsonrpc/src/main/scala/scala/meta/jsonrpc/Message.scala
@@ -3,12 +3,13 @@ package scala.meta.jsonrpc
 import monix.eval.Task
 import io.circe.Json
 import io.circe.Decoder
-import io.circe.generic.JsonCodec
-import cats.syntax.either._
 import io.circe.Encoder
 import io.circe.JsonObject
+import io.circe.derivation.JsonCodec
 import io.circe.syntax._
 
+import cats.syntax.either._
+
 sealed trait Message
 object Message {
   implicit val encoder: Encoder[Message] = new Encoder[Message] {

diff --git a/lsp4s/src/main/scala/scala/meta/lsp/Commands.scala b/lsp4s/src/main/scala/scala/meta/lsp/Commands.scala
@@ -1,7 +1,7 @@
 package scala.meta.lsp
 
 import io.circe.Json
-import io.circe.generic.JsonCodec
+import io.circe.derivation.JsonCodec
 
 /**
  * Parameters and types used in the `initialize` message.

diff --git a/lsp4s/src/main/scala/scala/meta/lsp/Types.scala b/lsp4s/src/main/scala/scala/meta/lsp/Types.scala
@@ -4,7 +4,7 @@ import cats.syntax.either._
 import io.circe.Decoder
 import io.circe.Encoder
 import io.circe.Json
-import io.circe.generic.JsonCodec
+import io.circe.derivation.JsonCodec
 
 /**
  * Position in a text document expressed as zero-based line and character offset.