Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade play to 2.7.3 and add support for scala-2.13 #82

Merged
merged 1 commit into from
Sep 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
```

Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")