Use latest JMH plugin, fix jmhJar task, and bump gradle

getodk · Feb 27, 2020 · e520094 · e520094
1 parent 73757af
commit e520094
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
  id 'java'
  id 'checkstyle'
  id 'jacoco'
- id "me.champeau.gradle.jmh" version "0.4.8"
+ id "me.champeau.gradle.jmh" version "0.5.0"
 }
 
 repositories {
@@ -75,8 +75,12 @@ javadoc {
  failOnError = false
 }
 
+jmhJar.doFirst {
+ new File("build/resources/test").mkdirs()
+}
+
 jmh {
- exclude = "(BenchmarkTemplate)"
+ exclude = ["(BenchmarkTemplate)"]
  threads = 1
  fork = 1
  timeout = '10s'
@@ -91,6 +95,8 @@ jmh {
  includeTests = true
  resultFormat = 'CSV'
  forceGC = true
+
+ duplicateClassesStrategy = 'warn'
 }
 
 /**

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.6.4-all.zip