From cabe738e1ca1f1e3df844a1744d83e698023d2ed Mon Sep 17 00:00:00 2001 From: Andriy Plokhotnyuk Date: Sat, 5 May 2018 06:37:19 +0300 Subject: [PATCH] Update to latest JMH (#147) * Clean up of docs * Update version of dependencies --- README.md | 5 +++-- build.sbt | 4 ++-- plugin/src/main/resources/sbt-jmh.properties | 4 ++-- sbt-jmh-tester/build.sbt | 2 +- version.sbt | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f7c2eef..0f735b4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ The latest published plugin version is: [![Download](https://api.bintray.com/pac | Plugin version | JMH version & other information | | -------------------------------- |:-------------------------------------:| -| `0.3.3` (sbt 13.16 / sbt 1.0) | `1.19`, JMH bugfix release | +| `0.3.4` (sbt 13.17 / sbt 1.1.4) | `1.21`, support of GraalVM | +| `0.3.3` (sbt 13.17 / sbt 1.1.1) | `1.20`, JMH bugfix release | | `0.3.2` (sbt 13.16 / sbt 1.0) | `1.19`, minor bugfix release | | `0.3.1` (sbt 13.16 / sbt 1.0) | `1.19`, minor bugfix release | | `0.3.0` (sbt 13.16 / sbt 1.0) | `1.19`, async profiler, flame-graphs | @@ -42,7 +43,7 @@ your project is to add the below line to your `project/plugins.sbt` file: ```scala // project/plugins.sbt -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4") ``` and enable it in the projects where you want to (useful in multi-project builds, as you can enable it only where you need it): diff --git a/build.sbt b/build.sbt index d95e348..279945b 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ val jmhVersion = { val commonSettings = Seq( organization := "pl.project13.scala", - crossSbtVersions := Vector("0.13.17", "1.1.1"), + crossSbtVersions := Vector("0.13.17", "1.1.4"), scalacOptions ++= List( "-unchecked", @@ -110,7 +110,7 @@ lazy val extras = project .settings(sonatypeSettings: _*) .settings( name := "sbt-jmh-extras", - scalaVersion := "2.12.2", + scalaVersion := "2.12.6", autoScalaLibrary := false, // it is plain Java crossPaths := false // it is plain Java ) diff --git a/plugin/src/main/resources/sbt-jmh.properties b/plugin/src/main/resources/sbt-jmh.properties index 5c055a5..9f5c6d9 100644 --- a/plugin/src/main/resources/sbt-jmh.properties +++ b/plugin/src/main/resources/sbt-jmh.properties @@ -1,2 +1,2 @@ -jmh.version=1.20 -extras.version=0.3.3 +jmh.version=1.21 +extras.version=0.3.4-SNAPSHOT diff --git a/sbt-jmh-tester/build.sbt b/sbt-jmh-tester/build.sbt index 62dca9a..3466fd7 100644 --- a/sbt-jmh-tester/build.sbt +++ b/sbt-jmh-tester/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "2.12.2" +scalaVersion := "2.12.6" enablePlugins(JmhPlugin) diff --git a/version.sbt b/version.sbt index 0d3bc31..dfd7e19 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.3.3" +version in ThisBuild := "0.3.4-SNAPSHOT"