Use kts build script in example projects & update with latest dsl

build.gradle.kts

@@ -0,0 +1,57 @@
+import kotlinx.team.infra.*
+
+buildscript {
+    val kotlin_version: String by project
+    val infra_version: String by project
+
+    repositories {
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven")
+        gradlePluginPortal()
+
+        addDevRepositoryIfEnabled(this, project)
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+        classpath("kotlinx.team:kotlinx.team.infra:$infra_version")
+    }
+}
+
+apply(plugin = "kotlinx.team.infra")
+
+configure<InfraExtension> {
+    publishing {
+        include(":kotlinx-benchmark-runtime")
+
+        libraryRepoUrl = "https://github.com/Kotlin/kotlinx-benchmark"
+
+        if (project.findProperty("publication_repository") == "sonatype") {
+            sonatype {
+                libraryStagingRepoDescription = project.name
+            }
+        }
+    }
+}
+
+// https://youtrack.jetbrains.com/issue/KT-48410
+repositories {
+    mavenCentral()
+}
+
+afterEvaluate {
+    gradle.includedBuilds.forEach { included ->
+        project(":kotlinx-benchmark-runtime").tasks.named("publishToMavenLocal").configure {
+            dependsOn(included.task(":publishToMavenLocal"))
+        }
+    }
+}
+
+allprojects {
+    val kotlin_version: String by project
+    val infra_version: String by project
+
+    logger.info("Using Kotlin $kotlin_version for project ${this.name}")
+    repositories {
+        addDevRepositoryIfEnabled(this, project)
+    }
+}

buildSrc/build.gradle.kts

@@ -7,8 +7,4 @@ plugins {
 
 repositories {
     mavenCentral()
-}
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
 }

examples/build.gradle.kts

@@ -0,0 +1,8 @@
+group "org.jetbrains.kotlinx.benchmark.examples"
+version "0.1-SNAPSHOT"
+
+subprojects {
+    repositories {
+        mavenCentral()
+    }
+}

examples/java/build.gradle → examples/java/build.gradle.kts

@@ -1,26 +1,27 @@
+import kotlinx.benchmark.gradle.*
+
 buildscript {
     dependencies {
-        classpath "org.jetbrains.kotlinx:kotlinx-benchmark-plugin"
+        classpath("org.jetbrains.kotlinx:kotlinx-benchmark-plugin")
     }
 }
 
 plugins {
-    id 'java'
+    java
+    id("org.jetbrains.kotlinx.benchmark")
 }
 
-apply plugin: 'org.jetbrains.kotlinx.benchmark'
-
 dependencies {
     implementation(project(":kotlinx-benchmark-runtime"))
 }
 
 benchmark {
     configurations {
-        main { 
+        named("main") {
             iterationTime = 300
             iterationTimeUnit = "ms"
         }
-        singleParam {
+        create("singleParam") {
             iterationTime = 300
             iterationTimeUnit = "ms"
             param("stringValue", "C", "D")
@@ -29,6 +30,7 @@ benchmark {
     }
     targets {
         register("main") {
+            this as JvmBenchmarkTarget
             jmhVersion = "1.21"
         }
     }

examples/kotlin-multiplatform/build.gradle → examples/kotlin-multiplatform/build.gradle.kts

@@ -1,11 +1,12 @@
+import kotlinx.benchmark.gradle.*
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import kotlinx.benchmark.gradle.JsBenchmarksExecutor
 
 plugins {
-    id 'org.jetbrains.kotlin.multiplatform'
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.9.0"
-    id 'org.jetbrains.kotlinx.benchmark'
+    kotlin("multiplatform")
+    kotlin("plugin.allopen") version "1.9.0"
+    id("org.jetbrains.kotlinx.benchmark")
 }
 
 // how to apply plugin to a specific source set?
@@ -15,15 +16,15 @@ allOpen {
 
 kotlin {
     jvm {
-        compilations.create('benchmark') { associateWith(compilations.main) }
+        compilations.create("benchmark") { associateWith(compilations.getByName("main")) }
     }
-    js('jsIr', IR) { nodejs() }
-    js('jsIrBuiltIn', IR) { nodejs() }
-    wasm('wasmJs') { d8() }
-    if (HostManager.host == KonanTarget.MACOS_X64.INSTANCE) macosX64('native')
-    if (HostManager.host == KonanTarget.MACOS_ARM64.INSTANCE) macosArm64('native')
-    if (HostManager.hostIsLinux) linuxX64('native')
-    if (HostManager.hostIsMingw) mingwX64('native')
+    js("jsIr", IR) { nodejs() }
+    js("jsIrBuiltIn", IR) { nodejs() }
+    wasm("wasmJs") { d8() }
+    if (HostManager.host == KonanTarget.MACOS_X64) macosX64("native")
+    if (HostManager.host == KonanTarget.MACOS_ARM64) macosArm64("native")
+    if (HostManager.hostIsLinux) linuxX64("native")
+    if (HostManager.hostIsMingw) mingwX64("native")
 
     sourceSets.all {
         languageSettings {
@@ -32,39 +33,45 @@ kotlin {
     }
 
     sourceSets {
-        commonMain {
+        getByName("commonMain") {
             dependencies {
-                implementation project(":kotlinx-benchmark-runtime")
+                implementation(project(":kotlinx-benchmark-runtime"))
             }
         }
 
-        jvmMain {}
+        getByName("jvmMain") {}
 
-        wasmJsMain {}
+        getByName("wasmJsMain") {}
 
-        jsMain {
-            jsIrMain.dependsOn(it)
-            jsIrBuiltInMain.dependsOn(it)
+
+        val jsMain by creating
+
+        getByName("jsIrMain") {
+            dependsOn(jsMain)
+        }
+
+        getByName("jsIrBuiltInMain") {
+            dependsOn(jsMain)
         }
 
-        nativeMain {
-            dependsOn(commonMain)
+        getByName("nativeMain") {
+            dependsOn(getByName("commonMain"))
         }
     }
 }
 
 // Configure benchmark
 benchmark {
     configurations {
-        main { // --> jvmBenchmark, jsBenchmark, <native target>Benchmark, benchmark
+        named("main") { // --> jvmBenchmark, jsBenchmark, <native target>Benchmark, benchmark
             iterations = 5 // number of iterations
             iterationTime = 300
             iterationTimeUnit = "ms"
             advanced("jvmForks", 3)
             advanced("jsUseBridge", true)
         }
 
-        params {
+        create("params") {
             iterations = 5 // number of iterations
             iterationTime = 300
             iterationTimeUnit = "ms"
@@ -73,7 +80,7 @@ benchmark {
             param("unused", 6, 9)
         }
 
-        fast { // --> jvmFastBenchmark, jsFastBenchmark, <native target>FastBenchmark, fastBenchmark
+        create("fast") { // --> jvmFastBenchmark, jsFastBenchmark, <native target>FastBenchmark, fastBenchmark
             include("Common")
             exclude("long")
             iterations = 5
@@ -82,7 +89,7 @@ benchmark {
             advanced("nativeGCAfterIteration", true)
         }
 
-        csv {
+        create("csv") {
             include("Common")
             exclude("long")
             iterations = 1
@@ -91,7 +98,7 @@ benchmark {
             reportFormat = "csv" // csv report format
         }
 
-        fork {
+        create("fork") {
             include("CommonBenchmark")
             iterations = 5
             iterationTime = 300
@@ -106,15 +113,18 @@ benchmark {
         // This one matches target name, e.g. 'jvm', 'js',
         // and registers its 'main' compilation, so 'jvm' registers 'jvmMain'
         register("jvm") {
+            this as JvmBenchmarkTarget
             jmhVersion = "1.21"
         }
         // This one matches source set name, e.g. 'jvmMain', 'jvmTest', etc
         // and register the corresponding compilation (here the 'benchmark' compilation declared in the 'jvm' target)
         register("jvmBenchmark") {
+            this as JvmBenchmarkTarget
             jmhVersion = "1.21"
         }
         register("jsIr")
         register("jsIrBuiltIn") {
+            this as JsBenchmarkTarget
             jsBenchmarksExecutor = JsBenchmarksExecutor.BuiltIn
         }
         register("wasmJs")