diff --git a/README.md b/README.md index 4dfd444..968f555 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,8 @@ Compatible with scala 2.11 and scala 2.12, with play-json and circe. |--------------------|---------------------------| | 2.6.2 | 0.1 | | 2.6.7 | 0.3 | -| 2.7.4 | 1.A | +| 2.7.4 | 1.1 | +| 2.8.1 | 1.2 | ### Add Dependency diff --git a/build.sbt b/build.sbt index 638c081..ea633d9 100644 --- a/build.sbt +++ b/build.sbt @@ -38,15 +38,15 @@ lazy val `metrics-circe` = (project in file("modules/metrics-circe")) "io.circe" %% "circe-generic", "io.circe" %% "circe-parser" ).map(_ % circeVersion % Compile)) - .settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % Test) + .settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % Test) .dependsOn(`metrics-core`) .aggregate(`metrics-core`) -val playJsonVersion = "2.7.4" +val playJsonVersion = "2.8.1" lazy val `metrics-playjson` = (project in file("modules/metrics-playjson")) .settings(GlobalSettings) .settings(libraryDependencies += "com.typesafe.play" %% "play-json" % playJsonVersion % Compile) - .settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % Test) + .settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % Test) .settings(libraryDependencies += "org.joda" % "joda-convert" % "2.2.1" % Compile) .dependsOn(`metrics-core`) .aggregate(`metrics-core`) diff --git a/modules/metrics-playjson/src/main/scala/io/tabmo/metrics/playjson/PlayJsonMetricsEncoder.scala b/modules/metrics-playjson/src/main/scala/io/tabmo/metrics/playjson/PlayJsonMetricsEncoder.scala index c52bc6d..6df2082 100644 --- a/modules/metrics-playjson/src/main/scala/io/tabmo/metrics/playjson/PlayJsonMetricsEncoder.scala +++ b/modules/metrics-playjson/src/main/scala/io/tabmo/metrics/playjson/PlayJsonMetricsEncoder.scala @@ -61,7 +61,7 @@ trait PlayJsonMetricsEncoder { ) } - implicit def gaugeEncoder: Writes[Gauge[_]] = Writes { gauge => + def gaugeEncoder(gauge: Gauge[_]): JsValue = { gauge.getValue match { case x: Int => JsNumber(x) case x: Long => JsNumber(x) @@ -80,7 +80,7 @@ trait PlayJsonMetricsEncoder { case m: Meter => Json.obj(key -> m) case t: Timer => Json.obj(key -> t) case c: Counter => Json.obj(key -> c) - case g: Gauge[_] => Json.obj(key -> g) + case g: Gauge[_] => Json.obj(key -> gaugeEncoder(g)) case _ => Json.obj() } diff --git a/version.sbt b/version.sbt index 46fbe50..be39869 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.1" +version in ThisBuild := "1.2"