diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f1a5b29..3c4aec80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,18 @@
+v4.0.6: Jun 2019
+================
+
+* No code changes.
+* Scaladoc improvements.
+* Updates: metrics-core 4.0.5 -> 4.1.0, Akka: 2.5.22 -> 2.5.23.
+* Added scala 2.13.0-RC3. Note: 2.13.0-RC3 is only supported until the next 2.13 release.
+
v4.0.5: May 2019
================
* No code changes (except for tests).
* Updates: Akka: 2.5.19 -> 2.5.22.
* Tests now use mockito-scala instead of mockito.
-* Added scala 2.13.0-RC1 (dropped scala 2.13.0-M5). Note: 2.13.0-RC1 is only supported until the next pre-2.13 release.
+* Added scala 2.13.0-RC1. Note: 2.13.0-RC1 is no longer supported, please use v4.0.6 for scala 2.13.0-RC3.
v4.0.4: Jan 2019
================
@@ -12,7 +20,7 @@ v4.0.4: Jan 2019
* No code changes.
* Updates: scala 2.12.7 -> 2.12.8, dropwizard metrics: 4.0.3 -> 4.0.5, HdrHistogram: 2.1.10 -> 2.1.11,
Akka: 2.5.18 -> 2.5.19.
-* Added scala 2.13.0-M5. Note: 2.13.0-M5 is no longer supported, please use v4.0.5 for scala 2.13.0-RC1.
+* Added scala 2.13.0-M5. Note: 2.13.0-M5 is no longer supported, please use v4.0.6 for scala 2.13.0-RC3.
v4.0.3: Nov 2018
================
diff --git a/README.md b/README.md
index d9b57769..8322f539 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Akka versions see [all available versions](/docs/AvailableVersions.md).
| 2.11 |
2.12 |
- 2.13.0-RC1 (*) |
+ 2.13.0-RC3 (*) |
2.5 |
2.4 |
@@ -96,7 +96,7 @@ Akka versions see [all available versions](/docs/AvailableVersions.md).
✓ |
|
|
- Dropwizard-metrics 4.0.4 |
+ Dropwizard-metrics 4.1.0 |
| metrics4-akka_a25 |
@@ -105,7 +105,7 @@ Akka versions see [all available versions](/docs/AvailableVersions.md).
✓ |
✓ |
|
- Akka 2.5.19 |
+ Akka 2.5.23 |
| metrics4-akka_a24 |
@@ -128,7 +128,7 @@ Akka versions see [all available versions](/docs/AvailableVersions.md).
-(*) Milestone versions are only supported until a non-milestone version is available.
+(*) RC versions are only supported until the next version is available.
(**) The first number is the version of `"org.mpierce.metrics.reservoir" % "hdrhistogram-metrics-reservoir"`,
the second the version of `"org.hdrhistogram" % "HdrHistogram"`.
@@ -144,7 +144,7 @@ Metrics-scala 3.x and metrics-scala 4.x can be used at the same time on top of e
## Download 4.x
-Release notes for 4.0.5.
+Release notes for 4.0.6.
WARNING: `nl.grons:metrics-scala:4.0.0` was accidentally released as well. *Do not use it* as it will give
binary compatibility problems. Instead use `"nl.grons" %% "metrics4-scala" % "4.0.1"` or later as described below.
@@ -152,9 +152,9 @@ binary compatibility problems. Instead use `"nl.grons" %% "metrics4-scala" % "4.
SBT:
```
libraryDependencies ++= Seq(
- "nl.grons" %% "metrics4-scala" % "4.0.5",
- "nl.grons" %% "metrics4-akka_a24" % "4.0.5",
- "nl.grons" %% "metrics4-scala-hdr" % "4.0.5"
+ "nl.grons" %% "metrics4-scala" % "4.0.6",
+ "nl.grons" %% "metrics4-akka_a24" % "4.0.6",
+ "nl.grons" %% "metrics4-scala-hdr" % "4.0.6"
)
```
@@ -163,7 +163,7 @@ Maven:
2.12.7
2.12
- 4.0.5
+ 4.0.6
nl.grons
diff --git a/build.sbt b/build.sbt
index 071d1b1c..4387a2f9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,8 +3,8 @@ lazy val commonSettings = Seq(
scalaVersion := "2.12.8",
crossVersion := CrossVersion.binary,
libraryDependencies ++= Seq(
- "org.scalatest" %% "scalatest" % "3.1.0-SNAP10" % Test,
- "org.mockito" %% "mockito-scala" % "1.4.6" % Test,
+ "org.scalatest" %% "scalatest" % "3.1.0-SNAP12" % Test,
+ "org.mockito" %% "mockito-scala" % "1.5.2" % Test,
"org.slf4j" % "slf4j-simple" % "1.7.26" % Test
),
fork := true,
@@ -49,7 +49,7 @@ lazy val root = (project in file("."))
lazy val metricsScala = (project in file("metrics-scala"))
.settings(
commonSettings,
- crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC1"),
+ crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC3"),
name := "metrics4-scala",
description := "metrics-scala for Scala " + CrossVersion.binaryScalaVersion(scalaVersion.value),
libraryDependencies ++= Seq(
@@ -63,7 +63,7 @@ lazy val metricsScalaHdr = (project in file("metrics-scala-hdr"))
.dependsOn(metricsScala)
.settings(
commonSettings,
- crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC1"),
+ crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC3"),
name := "metrics4-scala-hdr",
description := "metrics-scala-hdr for Scala " + CrossVersion.binaryScalaVersion(scalaVersion.value),
libraryDependencies ++= Seq(
@@ -78,12 +78,12 @@ lazy val metricsAkka25 = (project in file("metrics-akka-25"))
.dependsOn(metricsScala)
.settings(
commonSettings,
- crossScalaVersions := Seq("2.12.8", "2.13.0-RC1"),
+ crossScalaVersions := Seq("2.12.8", "2.13.0-RC3"),
name := "metrics4-akka_a25",
description := "metrics-scala for Akka 2.5 and Scala " + CrossVersion.binaryScalaVersion(scalaVersion.value),
libraryDependencies ++= Seq(
- "com.typesafe.akka" %% "akka-actor" % "2.5.22",
- "com.typesafe.akka" %% "akka-testkit" % "2.5.22" % Test
+ "com.typesafe.akka" %% "akka-actor" % "2.5.23",
+ "com.typesafe.akka" %% "akka-testkit" % "2.5.23" % Test
),
sourceDirectory := baseDirectory.value.getParentFile / "metrics-akka" / "src",
mimaPreviousArtifacts := Set("nl.grons" %% "metrics4-akka_a25" % "4.0.1")
diff --git a/docs/AvailableVersions.md b/docs/AvailableVersions.md
index 46068883..cebfb045 100644
--- a/docs/AvailableVersions.md
+++ b/docs/AvailableVersions.md
@@ -21,19 +21,19 @@ The table shows the available 4.x artifacts of metrics-scala.
| 2.11 |
2.12 |
- 2.13.0-RC1 (*) |
+ 2.13.0-RC3 (*) |
2.4 |
2.5 |
- | 4.0.5 |
+ 4.0.6 |
metrics4-scala |
✓ |
✓ |
✓ |
|
|
- Dropwizard-metrics 4.0.5 |
+ Dropwizard-metrics 4.1.0 |
| metrics4-akka_a25 |
@@ -42,7 +42,7 @@ The table shows the available 4.x artifacts of metrics-scala.
✓ |
|
✓ |
- Akka 2.5.22 |
+ Akka 2.5.23 |
| metrics4-akka_a24 |
@@ -62,6 +62,43 @@ The table shows the available 4.x artifacts of metrics-scala.
|
Hdr 1.1.0/2.1.11 (**) |
+
+ | 4.0.5 |
+ metrics4-scala |
+ ✓ |
+ ✓ |
+ |
+ |
+ |
+ Dropwizard-metrics 4.0.5 |
+
+
+ | metrics4-akka_a25 |
+ |
+ ✓ |
+ |
+ |
+ ✓ |
+ Akka 2.5.22 |
+
+
+ | metrics4-akka_a24 |
+ ✓ |
+ ✓ |
+ |
+ ✓ |
+ ✓ |
+ Akka 2.4.20 |
+
+
+ | metrics4-scala-hdr |
+ ✓ |
+ ✓ |
+ |
+ |
+ |
+ Hdr 1.1.0/2.1.11 (**) |
+
| 4.0.4 |
metrics4-scala |
@@ -217,7 +254,7 @@ The table shows the available 4.x artifacts of metrics-scala.
-(*) Scala pre-releases are only supported till the next release of the same Scala major version.
+(*) Scala pre-releases are only supported till the next version of metrics-scala.
(**) The first number is the version of `"org.mpierce.metrics.reservoir" % "hdrhistogram-metrics-reservoir"`,
the second the version of `"org.hdrhistogram" % "HdrHistogram"`.
diff --git a/project/build.properties b/project/build.properties
index 7c58a83a..c0bab049 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.2.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 29256f9b..8ad4d9da 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")