merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 5 insertions, 33 deletions

diff --git a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts
index 4e73d4d3..65608e8f 100644
--- a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts
@@ -20,49 +20,21 @@
  * SOFTWARE.
  */
 
-import kotlinx.benchmark.gradle.*
 import org.jetbrains.kotlin.allopen.gradle.*
 
 plugins {
-    id("org.jetbrains.kotlinx.benchmark")
     `java-library`
     kotlin("plugin.allopen")
-}
-
-sourceSets {
-    register("jmh") {
-        compileClasspath += sourceSets["main"].output
-        runtimeClasspath += sourceSets["main"].output
-    }
-}
-
-configurations {
-    named("jmhImplementation") {
-        extendsFrom(configurations["implementation"])
-    }
+    id("me.champeau.jmh")
 }
 
 configure<AllOpenExtension> {
     annotation("org.openjdk.jmh.annotations.State")
 }
 
-benchmark {
-    targets {
-        register("jmh") {
-            this as JvmBenchmarkTarget
-            jmhVersion = "1.21"
-        }
-    }
-}
-
-dependencies {
-    val libs = Libs(project)
-    implementation(libs["kotlinx-benchmark-runtime-jvm"])
-}
+jmh {
+    jmhVersion.set("1.33")
 
-// Workaround for https://github.com/Kotlin/kotlinx-benchmark/issues/39
-afterEvaluate {
-    tasks.named<org.gradle.jvm.tasks.Jar>("jmhBenchmarkJar") {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
+    profilers.add("stack")
+    profilers.add("gc")
 }