From 805e211298605483fceda7299fafba7ab145c3a5 Mon Sep 17 00:00:00 2001 From: Ran Nisim Date: Fri, 6 Sep 2019 12:32:52 +0300 Subject: [PATCH] upgrade play to 2.7.3 and add support for scala-2.13 (#82) --- .travis.yml | 4 ++-- README.md | 7 +++---- build.sbt | 8 ++++---- project/plugins.sbt | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f4eb84..c323d27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: scala scala: + - 2.13.0 - 2.12.8 - - 2.11.12 jdk: - - oraclejdk8 + - openjdk8 script: - sbt ++${TRAVIS_SCALA_VERSION} clean coverage test coverageReport after_success: diff --git a/README.md b/README.md index 96696e4..408f7ae 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Add metrics-play dependency: ```scala val appDependencies = Seq( ... - "com.kenshoo" %% "metrics-play" % "2.7.0_0.8.0" + "com.kenshoo" %% "metrics-play" % "2.7.3_0.8.1" ) ``` @@ -129,16 +129,15 @@ class MyMetricsModule extends Module { } ``` -and add a line like this to application.conf +and add the following line to application.conf ``` play.modules.enabled+="myapp.MyMetricsModule" ``` -instead of `com.kenshoo.play.metrics.PlayModule` - ## Changes +* 2.7.3_0.8.1 - Upgrade to play 2.7.3 and support Scala version 2.12.8 / 2.13.0 with dropwizard 4.0.5 * 2.7.0_0.8.0 - Upgrade to play 2.7.0 and Scala 2.12.8 and dropwizard 4.0.5 * 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. diff --git a/build.sbt b/build.sbt index 22371a6..7856384 100644 --- a/build.sbt +++ b/build.sbt @@ -2,13 +2,13 @@ organization:= "com.kenshoo" name := "metrics-play" -scalaVersion := "2.12.8" +scalaVersion := "2.13.0" -crossScalaVersions := Seq(scalaVersion.value, "2.11.12") +crossScalaVersions := Seq(scalaVersion.value, "2.12.8") -val playVersion = "2.7.0" +val playVersion = "2.7.3" -val metricsPlayVersion = "0.8.0" +val metricsPlayVersion = "0.8.1" val dropwizardVersion = "4.0.5" diff --git a/project/plugins.sbt b/project/plugins.sbt index 89de9c9..0839485 100644 --- 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.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")