From 3fec2be8cbeadc365e3d8bf419fcf3be17dccaa2 Mon Sep 17 00:00:00 2001
From: Alan Cai <caialan@amazon.com>
Date: Tue, 14 May 2024 17:17:04 -0700
Subject: [PATCH] Upgrade JMH plugin dependency to 0.7.2 (#1462)

---
 buildSrc/src/main/kotlin/partiql.versions.kt |  9 ++-------
 partiql-lang/build.gradle.kts                | 14 +-------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/buildSrc/src/main/kotlin/partiql.versions.kt b/buildSrc/src/main/kotlin/partiql.versions.kt
index 2fb76403bb..75eab9e8ec 100644
--- a/buildSrc/src/main/kotlin/partiql.versions.kt
+++ b/buildSrc/src/main/kotlin/partiql.versions.kt
@@ -36,7 +36,7 @@ object Versions {
     const val jansi = "2.4.0"
     const val jgenhtml = "1.6"
     const val jline = "3.21.0"
-    const val jmhGradlePlugin = "0.5.3"
+    const val jmhGradlePlugin = "0.7.2"
     const val jmhCore = "1.37"
     const val jmhGeneratorAnnprocess = "1.37"
     const val jmhGeneratorBytecode = "1.37"
@@ -108,11 +108,6 @@ object Deps {
     const val mockk = "io.mockk:mockk:${Versions.mockk}"
     const val kotlinxCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinxCoroutinesTest}"
     const val ktlintTest = "com.pinterest.ktlint:ktlint-test:${Versions.ktlint}"
-
-    // JMH Benchmarking
-    const val jmhCore = "org.openjdk.jmh:jmh-core:${Versions.jmhCore}"
-    const val jmhGeneratorAnnprocess = "org.openjdk.jmh:jmh-core:${Versions.jmhGeneratorAnnprocess}"
-    const val jmhGeneratorBytecode = "org.openjdk.jmh:jmh-core:${Versions.jmhGeneratorBytecode}"
 }
 
 object Plugins {
@@ -126,7 +121,7 @@ object Plugins {
     const val application = "org.gradle.application"
     const val detekt = "io.gitlab.arturbosch.detekt"
     const val dokka = "org.jetbrains.dokka"
-    const val jmh = "me.champeau.gradle.jmh"
+    const val jmh = "me.champeau.jmh"
     const val library = "org.gradle.java-library"
     const val testFixtures = "org.gradle.java-test-fixtures"
 }
\ No newline at end of file
diff --git a/partiql-lang/build.gradle.kts b/partiql-lang/build.gradle.kts
index 1ef9cdac32..ede818448e 100644
--- a/partiql-lang/build.gradle.kts
+++ b/partiql-lang/build.gradle.kts
@@ -50,18 +50,6 @@ dependencies {
     testImplementation(Deps.junitVintage) // Enables JUnit4
     testImplementation(Deps.mockk)
     testImplementation(Deps.kotlinxCoroutinesTest)
-
-    // The JMH gradle plugin that we currently use is 0.5.3, which uses JMH version 1.25. The JMH gradle plugin has a
-    // newer version (see https://github.com/melix/jmh-gradle-plugin/releases) which upgrades the JMH version. We can't
-    // use that newer plugin version until we upgrade our gradle version to 8.0+. JMH version 1.25 does not support
-    // creating CPU flamegraphs using the JMH benchmarks, hence why the newer version dependency is specified here.
-    //
-    // When we upgrade gradle to 8.0+, we can upgrade the gradle plugin to the latest and remove this dependency block
-    dependencies {
-        jmh(Deps.jmhCore)
-        jmh(Deps.jmhGeneratorAnnprocess)
-        jmh(Deps.jmhGeneratorBytecode)
-    }
 }
 
 val relocations = mapOf(
@@ -91,7 +79,7 @@ publish {
 jmh {
     resultFormat = properties["resultFormat"] as String? ?: "json"
     resultsFile = project.file(properties["resultsFile"] as String? ?: "$buildDir/reports/jmh/results.json")
-    include = listOfNotNull(properties["include"] as String?)
+    includes = listOfNotNull(properties["include"] as String?)
     properties["warmupIterations"]?.let { it -> warmupIterations = Integer.parseInt(it as String) }
     properties["iterations"]?.let { it -> iterations = Integer.parseInt(it as String) }
     properties["fork"]?.let { it -> fork = Integer.parseInt(it as String) }