Bumping dependencies (#77)

* Bumping dependencies Play 2.6.19 Dropwizard 4.0.3 Scala 2.12.6 * Fixing tests * Removing not needed dependencies * Fixing PR comment on returning Unit
kenshoo · Oct 18, 2018 · f24567c · f24567c
1 parent 3c94824
commit f24567c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This module provides some support for @codahale [Metrics](https://dropwizard.git
 
 [![codecov.io](https://img.shields.io/codecov/c/gh/kenshoo/metrics-play/master.svg)](https://codecov.io/github/kenshoo/metrics-play/branch/master)
 
-Play Version: 2.6.2, Metrics Version: 3.2.2, Scala Versions: 2.12.2
+Play Version: 2.6.19, Metrics Version: 4.0.3, Scala Versions: 2.12.6
 
 ## Features
 
@@ -22,7 +22,7 @@ Add metrics-play dependency:
 ```scala
     val appDependencies = Seq(
     ...
-    "com.kenshoo" %% "metrics-play" % "2.6.2_0.6.1"
+    "com.kenshoo" %% "metrics-play" % "2.6.19_0.7.0"
     )
 ```
 
@@ -139,6 +139,7 @@ instead of `com.kenshoo.play.metrics.PlayModule`
 
 ## Changes
 
+* 2.6.19_0.7.0 - Upgrade to play 2.6.19 and Scala 2.12.6 and dropwizard 4.0.3
 * 2.6.2_0.6.1 - Upgrade to play 2.6 and Scala 2.12. Migration: If you get errors like "No configuration setting found ..." when building fat JARs, check your merge strategy for reference.conf. 
 * 2.4.0_0.4.0 - Re-implement as Play Module
 * 2.4.0_0.3.0 - Upgrade to play 2.4, metrics 3.1.2

diff --git a/build.sbt b/build.sbt
@@ -2,13 +2,15 @@ organization:= "com.kenshoo"
 
 name := "metrics-play"
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.6"
 
 crossScalaVersions := Seq(scalaVersion.value, "2.11.11")
 
-val playVersion = "2.6.6"
+val playVersion = "2.6.19"
 
-val metricsPlayVersion = "0.6.2"
+val metricsPlayVersion = "0.7.0"
+
+val dropwizardVersion = "4.0.3"
 
 version := s"${playVersion}_${metricsPlayVersion}"
 
@@ -26,17 +28,18 @@ resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
 
 resolvers += "specs2" at "https://mvnrepository.com/artifact/org.specs2/specs2_2.12"
 
+
 libraryDependencies ++= Seq(
-    "io.dropwizard.metrics" % "metrics-core" % "3.2.4",
-    "io.dropwizard.metrics" % "metrics-json" % "3.2.4",
-    "io.dropwizard.metrics" % "metrics-jvm" % "3.2.4",
-    "io.dropwizard.metrics" % "metrics-logback" % "3.2.4",
-    "com.typesafe.play" %% "play" % playVersion % "provided",
-    "org.joda" % "joda-convert" % "1.8.2",
-    //test
-    "com.typesafe.play" %% "play-test" % "2.6.2" % "test",
-    "com.typesafe.play" %% "play-specs2" % "2.6.2" % "test",
-    "org.specs2" %% "specs2" % "2.4.17" % "test"
+    "io.dropwizard.metrics" % "metrics-core" % dropwizardVersion,
+    "io.dropwizard.metrics" % "metrics-json" % dropwizardVersion,
+    "io.dropwizard.metrics" % "metrics-jvm" % dropwizardVersion,
+    "io.dropwizard.metrics" % "metrics-logback" % dropwizardVersion,
+    "com.typesafe.play" %% "play" % playVersion % Provided,
+    "org.joda" % "joda-convert" % "2.1.1",
+
+    //Test
+    "com.typesafe.play" %% "play-test" % playVersion % Test,
+    "com.typesafe.play" %% "play-specs2" % playVersion % Test
 )
 
 publishMavenStyle := true

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.1.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
diff --git a/src/main/scala/com/kenshoo/play/metrics/Metrics.scala b/src/main/scala/com/kenshoo/play/metrics/Metrics.scala
@@ -8,7 +8,8 @@ import ch.qos.logback.classic
 import com.codahale.metrics.json.MetricsModule
 import com.codahale.metrics.jvm.{ThreadStatesGaugeSet, MemoryUsageGaugeSet, GarbageCollectorMetricSet}
 import com.codahale.metrics.logback.InstrumentedAppender
-import com.codahale.metrics.{JvmAttributeGaugeSet, SharedMetricRegistries, MetricRegistry}
+import com.codahale.metrics.{SharedMetricRegistries, MetricRegistry}
+import com.codahale.metrics.jvm.JvmAttributeGaugeSet
 import com.fasterxml.jackson.databind.{ObjectWriter, ObjectMapper}
 import play.api.{Logger, Configuration}
 import play.api.inject.ApplicationLifecycle
@@ -28,12 +29,12 @@ class MetricsImpl @Inject() (lifecycle: ApplicationLifecycle, configuration: Con
 
   val validUnits = Set("NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS")
 
-  val registryName = configuration.get[String]("metrics.name")
-  val rateUnit = configuration.getAndValidate[String]("metrics.rateUnit", validUnits)
-  val durationUnit = configuration.getAndValidate[String]("metrics.durationUnit", validUnits)
-  val showSamples  = configuration.get[Boolean]("metrics.showSamples")
-  val jvmMetricsEnabled = configuration.get[Boolean]("metrics.jvm")
-  val logbackEnabled = configuration.get[Boolean]("metrics.logback")
+  val registryName: String = configuration.get[String]("metrics.name")
+  val rateUnit: String = configuration.getAndValidate[String]("metrics.rateUnit", validUnits)
+  val durationUnit: String = configuration.getAndValidate[String]("metrics.durationUnit", validUnits)
+  val showSamples: Boolean = configuration.get[Boolean]("metrics.showSamples")
+  val jvmMetricsEnabled: Boolean = configuration.get[Boolean]("metrics.jvm")
+  val logbackEnabled: Boolean = configuration.get[Boolean]("metrics.logback")
 
   val mapper: ObjectMapper = new ObjectMapper()
 
@@ -56,7 +57,7 @@ class MetricsImpl @Inject() (lifecycle: ApplicationLifecycle, configuration: Con
     }
   }
 
-  def setupLogbackMetrics(registry: MetricRegistry) = {
+  def setupLogbackMetrics(registry: MetricRegistry): Unit = {
     if (logbackEnabled) {
       val appender: InstrumentedAppender = new InstrumentedAppender(registry)
 
@@ -67,7 +68,7 @@ class MetricsImpl @Inject() (lifecycle: ApplicationLifecycle, configuration: Con
     }
   }
 
-  def onStart() = {
+  def onStart(): Unit = {
 
     setupJvmMetrics(defaultRegistry)
     setupLogbackMetrics(defaultRegistry)
@@ -76,7 +77,7 @@ class MetricsImpl @Inject() (lifecycle: ApplicationLifecycle, configuration: Con
     mapper.registerModule(module)
   }
 
-  def onStop() = {
+  def onStop(): Unit = {
     SharedMetricRegistries.remove(registryName)
   }
 

diff --git a/src/main/scala/com/kenshoo/play/metrics/PlayModule.scala b/src/main/scala/com/kenshoo/play/metrics/PlayModule.scala
@@ -1,10 +1,10 @@
 package com.kenshoo.play.metrics
 
-import play.api.{Environment, Configuration}
-import play.api.inject.Module
+import play.api.{Configuration, Environment}
+import play.api.inject.{Binding, Module}
 
 class PlayModule extends Module {
-  def bindings(environment: Environment, configuration: Configuration) = {
+  override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = {
     if (configuration.get[Boolean]("metrics.enabled")) {
       Seq(
         bind[MetricsFilter].to[MetricsFilterImpl].eagerly,

diff --git a/src/test/scala/com/kenshoo/play/metrics/MetricsSpec.scala b/src/test/scala/com/kenshoo/play/metrics/MetricsSpec.scala
@@ -27,7 +27,7 @@ class MetricsSpec extends Specification {
 
     "serialize to JSON" in withApplication(Map.empty) { implicit app =>
       val jsValue: JsValue = Json.parse(metrics.toJson)
-      (jsValue \ "version").as[String] mustEqual "3.1.3"
+      (jsValue \ "version").as[String] mustEqual "4.0.0"
     }
 
     "be able to add custom counter" in withApplication(Map("metrics.jvm" -> false)) { implicit app =>