Skip to content

Commit 2f2ab74

Browse files
alancai98rchowell
authored andcommitted
Upgrade JMH plugin dependency to 0.7.2 (#1462)
1 parent 0972fbe commit 2f2ab74

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

buildSrc/src/main/kotlin/partiql.versions.kt

+2-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Versions {
3636
const val jansi = "2.4.0"
3737
const val jgenhtml = "1.6"
3838
const val jline = "3.21.0"
39-
const val jmhGradlePlugin = "0.5.3"
39+
const val jmhGradlePlugin = "0.7.2"
4040
const val jmhCore = "1.37"
4141
const val jmhGeneratorAnnprocess = "1.37"
4242
const val jmhGeneratorBytecode = "1.37"
@@ -108,11 +108,6 @@ object Deps {
108108
const val mockk = "io.mockk:mockk:${Versions.mockk}"
109109
const val kotlinxCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinxCoroutinesTest}"
110110
const val ktlintTest = "com.pinterest.ktlint:ktlint-test:${Versions.ktlint}"
111-
112-
// JMH Benchmarking
113-
const val jmhCore = "org.openjdk.jmh:jmh-core:${Versions.jmhCore}"
114-
const val jmhGeneratorAnnprocess = "org.openjdk.jmh:jmh-core:${Versions.jmhGeneratorAnnprocess}"
115-
const val jmhGeneratorBytecode = "org.openjdk.jmh:jmh-core:${Versions.jmhGeneratorBytecode}"
116111
}
117112

118113
object Plugins {
@@ -126,7 +121,7 @@ object Plugins {
126121
const val application = "org.gradle.application"
127122
const val detekt = "io.gitlab.arturbosch.detekt"
128123
const val dokka = "org.jetbrains.dokka"
129-
const val jmh = "me.champeau.gradle.jmh"
124+
const val jmh = "me.champeau.jmh"
130125
const val library = "org.gradle.java-library"
131126
const val testFixtures = "org.gradle.java-test-fixtures"
132127
}

partiql-lang/build.gradle.kts

+1-13
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,6 @@ dependencies {
5050
testImplementation(Deps.junitVintage) // Enables JUnit4
5151
testImplementation(Deps.mockk)
5252
testImplementation(Deps.kotlinxCoroutinesTest)
53-
54-
// The JMH gradle plugin that we currently use is 0.5.3, which uses JMH version 1.25. The JMH gradle plugin has a
55-
// newer version (see https://github.com/melix/jmh-gradle-plugin/releases) which upgrades the JMH version. We can't
56-
// use that newer plugin version until we upgrade our gradle version to 8.0+. JMH version 1.25 does not support
57-
// creating CPU flamegraphs using the JMH benchmarks, hence why the newer version dependency is specified here.
58-
//
59-
// When we upgrade gradle to 8.0+, we can upgrade the gradle plugin to the latest and remove this dependency block
60-
dependencies {
61-
jmh(Deps.jmhCore)
62-
jmh(Deps.jmhGeneratorAnnprocess)
63-
jmh(Deps.jmhGeneratorBytecode)
64-
}
6553
}
6654

6755
val relocations = mapOf(
@@ -91,7 +79,7 @@ publish {
9179
jmh {
9280
resultFormat = properties["resultFormat"] as String? ?: "json"
9381
resultsFile = project.file(properties["resultsFile"] as String? ?: "$buildDir/reports/jmh/results.json")
94-
include = listOfNotNull(properties["include"] as String?)
82+
includes = listOfNotNull(properties["include"] as String?)
9583
properties["warmupIterations"]?.let { it -> warmupIterations = Integer.parseInt(it as String) }
9684
properties["iterations"]?.let { it -> iterations = Integer.parseInt(it as String) }
9785
properties["fork"]?.let { it -> fork = Integer.parseInt(it as String) }

0 commit comments

Comments
 (0)