Skip to content

Commit

Permalink
Replace circe-magnolia-derivation by circe-derivation for 2.13 compat
Browse files Browse the repository at this point in the history
  • Loading branch information
ghostdogpr committed Oct 1, 2019
1 parent f7c6b4e commit e83de26
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ lazy val http4s = project
.settings(commonSettings)
.settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio-interop-cats" % "2.0.0.0-RC4",
"org.typelevel" %% "cats-effect" % "2.0.0",
"org.http4s" %% "http4s-dsl" % "0.21.0-M5",
"org.http4s" %% "http4s-circe" % "0.21.0-M5",
"org.http4s" %% "http4s-blaze-server" % "0.21.0-M5",
"io.circe" %% "circe-magnolia-derivation" % "0.4.0",
"io.circe" %% "circe-parser" % "0.12.1"
"dev.zio" %% "zio-interop-cats" % "2.0.0.0-RC4",
"org.typelevel" %% "cats-effect" % "2.0.0",
"org.http4s" %% "http4s-dsl" % "0.21.0-M5",
"org.http4s" %% "http4s-circe" % "0.21.0-M5",
"org.http4s" %% "http4s-blaze-server" % "0.21.0-M5",
"io.circe" %% "circe-parser" % "0.12.1",
"io.circe" %% "circe-derivation" % "0.12.0-M7"
)
)
.dependsOn(core)
Expand Down
4 changes: 2 additions & 2 deletions http4s/src/main/scala/caliban/Http4sAdapter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package caliban
import caliban.parsing.adt.Value
import caliban.ResponseValue.{ ObjectValue, StreamValue }
import fs2.{ Pipe, Stream }
import io.circe.magnolia.derivation.decoder.semiauto._
import io.circe.derivation.deriveDecoder
import io.circe.parser.{ decode, parse }
import io.circe.{ Decoder, Json }
import org.http4s._
Expand All @@ -22,7 +22,7 @@ object Http4sAdapter {

case class GraphQLRequest(query: String, operationName: Option[String], variables: Option[Json] = None)

implicit val queryDecoder: Decoder[GraphQLRequest] = deriveMagnoliaDecoder[GraphQLRequest]
implicit val queryDecoder: Decoder[GraphQLRequest] = deriveDecoder[GraphQLRequest]

private def jsonToValue(json: Json): Value =
json.fold(
Expand Down

0 comments on commit e83de26

Please sign in to comment.