Skip to content

Commit

Permalink
Remove circe-jackson dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
vkostyukov committed Feb 9, 2018
1 parent c33218d commit bad9258
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 22 deletions.
6 changes: 2 additions & 4 deletions build.sbt
Expand Up @@ -2,7 +2,7 @@ import microsites.ExtraMdFileConfig

lazy val buildSettings = Seq(
organization := "com.github.finagle",
version := "0.17.0",
version := "0.18.0-SNAPSHOT",
scalaVersion := "2.12.4",
crossScalaVersions := Seq("2.11.12", "2.12.4")
)
Expand All @@ -11,7 +11,6 @@ lazy val finagleVersion = "18.2.0"
lazy val twitterServerVersion = "18.2.0"
lazy val circeVersion = "0.9.1"
lazy val circeIterateeVersion = "0.9.0"
lazy val circeJacksonVersion = "0.9.0"
lazy val catbirdVersion = "18.2.0"
lazy val shapelessVersion = "2.3.3"
lazy val catsVersion = "1.0.1"
Expand Down Expand Up @@ -268,8 +267,7 @@ lazy val circe = project
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-iteratee" % circeIterateeVersion,
"io.circe" %% "circe-jawn" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion % "test",
"io.circe" %% "circe-jackson28" % circeJacksonVersion
"io.circe" %% "circe-generic" % circeVersion % "test"
)
)
.dependsOn(core, iteratee, jsonTest % "test")
Expand Down
14 changes: 1 addition & 13 deletions circe/src/main/scala/io/finch/circe/package.scala
Expand Up @@ -2,7 +2,7 @@ package io.finch

import com.twitter.io.Buf
import io.circe.{Json, Printer}
import java.nio.charset.{Charset, StandardCharsets}
import java.nio.charset.Charset

package object circe extends Encoders with Decoders {

Expand All @@ -15,18 +15,6 @@ package object circe extends Encoders with Decoders {
Buf.ByteBuffer.Owned(printer.prettyByteBuffer(json, cs))
}

/**
* Provides Jackson Serializer.
*/
@deprecated("Use standard Circe serializer - it works great!", "0.17")
object jacksonSerializer extends Encoders with Decoders {
override protected def print(json: Json, cs: Charset): Buf =
if (cs == StandardCharsets.UTF_8)
Buf.ByteBuffer.Owned(io.circe.jackson.jacksonPrintByteBuffer(json))
else
Buf.ByteArray.Owned(io.circe.jackson.jacksonPrint(json).getBytes(cs.name))
}

/**
* Provides a [[Printer]] that uses a simple form of feedback-controller to predict the
* size of the printed message.
Expand Down
5 changes: 0 additions & 5 deletions circe/src/test/scala/io/finch/circe/test/CirceSpec.scala
Expand Up @@ -15,11 +15,6 @@ class CirceAccumulatingSpec extends AbstractJsonSpec {
checkEnumerateJson("circe-accumulating")
}

class CirceJacksonSpec extends AbstractJsonSpec {
import io.finch.circe.jacksonSerializer._
checkJson("circe-jackson")
}

class CirceDropNullKeysSpec extends AbstractJsonSpec {
import io.finch.circe.dropNullValues._
checkJson("circe-dropNullKeys")
Expand Down

0 comments on commit bad9258

Please sign in to comment.