Convert Gradle scripts from Groovy DSL to Kotlin DSL (#232)

* Convert Gradle scripts from Groovy DSL to Kotlin DSL
* convert java example to kts

Author: adam-enko

.gitignore

@@ -6,3 +6,4 @@ out/
 target/
 .DS_Store
 local.properties
+.kotlin/

build.gradle renamed to build.gradle.kts

@@ -1,19 +1,21 @@
-import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapperKt
+import kotlinx.team.infra.InfraExtension
+import kotlinx.validation.ExperimentalBCVApi
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import tasks.CheckReadmeTask
 
 buildscript {
     repositories {
-        maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven' }
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven")
         gradlePluginPortal()
 
-        KotlinCommunity.addDevRepositoryIfEnabled(delegate, project)
+        addDevRepositoryIfEnabled(this, project)
     }
 
     dependencies {
         classpath(libs.kotlinx.teamInfraGradlePlugin)
 
-        String kotlinVersion = providers.gradleProperty("kotlin_version").orNull
-        if (kotlinVersion != null && !kotlinVersion.isBlank()) {
+        val kotlinVersion = providers.gradleProperty("kotlin_version").orNull
+        if (!kotlinVersion.isNullOrBlank()) {
             // In addition to overriding the Kotlin version in the Version Catalog,
             // also enforce the KGP version using a dependency constraint.
             // Constraints are stricter than Version Catalog.
@@ -30,9 +32,9 @@ plugins {
     alias(libs.plugins.kotlinx.binaryCompatibilityValidator)
 }
 
-apply plugin: 'kotlinx.team.infra'
+apply(plugin = "kotlinx.team.infra")
 
-infra {
+extensions.configure<InfraExtension> {
     teamcity {
         libraryStagingRepoDescription = project.name
     }
@@ -55,64 +57,68 @@ repositories {
 
 // region Workarounds for https://github.com/gradle/gradle/issues/22335
 tasks.register("apiDump") {
-    it.dependsOn(gradle.includedBuild("plugin").task(":apiDump"))
+    dependsOn(gradle.includedBuild("plugin").task(":apiDump"))
 }
 
 tasks.register("apiCheck") {
-    it.dependsOn(gradle.includedBuild("plugin").task(":apiCheck"))
+    dependsOn(gradle.includedBuild("plugin").task(":apiCheck"))
 }
 
 afterEvaluate {
     gradle.includedBuilds.forEach { included ->
         project(":kotlinx-benchmark-runtime").tasks.named("publishToMavenLocal") { dependsOn(included.task(":publishToMavenLocal")) }
     }
 }
+tasks.register("publishToMavenLocal") {
+    dependsOn(gradle.includedBuild("plugin").task(":publishToMavenLocal"))
+}
 //endregion
 
-String currentKgpVersion = KotlinPluginWrapperKt.getKotlinPluginVersion(project)
-logger.info("Using Kotlin Gradle Plugin ${currentKgpVersion}")
+val currentKgpVersion = getKotlinPluginVersion()
+logger.info("Using Kotlin Gradle Plugin $currentKgpVersion")
 
-String kotlinVersionOverride = providers.gradleProperty("kotlin_version").getOrNull()
+val kotlinVersionOverride = providers.gradleProperty("kotlin_version").getOrNull()
 
 if (kotlinVersionOverride != null) {
-    String versionCatalogKotlinVersion = libs.versions.kotlin.get()
+    val versionCatalogKotlinVersion = libs.versions.kotlin.get()
     if (kotlinVersionOverride != versionCatalogKotlinVersion) {
-        throw new IllegalStateException("Kotlin version in Version Catalog was not overridden. Expected:$kotlinVersionOverride, actual:$versionCatalogKotlinVersion.")
+        throw IllegalStateException("Kotlin version in Version Catalog was not overridden. Expected:$kotlinVersionOverride, actual:$versionCatalogKotlinVersion.")
     }
     if (kotlinVersionOverride != currentKgpVersion) {
-        throw new IllegalStateException("Kotlin Gradle Plugin version was not overridden. Expected:$kotlinVersionOverride, actual:$currentKgpVersion.")
+        throw IllegalStateException("Kotlin Gradle Plugin version was not overridden. Expected:$kotlinVersionOverride, actual:$currentKgpVersion.")
     }
 }
 
 allprojects {
     repositories {
-        KotlinCommunity.addDevRepositoryIfEnabled(delegate, project)
+        addDevRepositoryIfEnabled(this, project)
     }
 }
 
 apiValidation {
-    ignoredProjects += [
-            "examples",
-            "java",
-            "kotlin",
-            "kotlin-kts",
-            "kotlin-multiplatform",
-            "integration",
-    ]
-
-    nonPublicMarkers += ["kotlinx.benchmark.internal.KotlinxBenchmarkRuntimeInternalApi"]
-
+    ignoredProjects += listOf(
+        "examples",
+        "java",
+        "kotlin",
+        "kotlin-kts",
+        "kotlin-multiplatform",
+        "integration",
+    )
+
+    nonPublicMarkers += listOf("kotlinx.benchmark.internal.KotlinxBenchmarkRuntimeInternalApi")
+
+    @OptIn(ExperimentalBCVApi::class)
     klib {
-        it.enabled = true
+        enabled = true
     }
 }
 
-tasks.register("checkReadme", CheckReadmeTask) {
+val checkReadme by tasks.registering(CheckReadmeTask::class) {
     minSupportedGradleVersion = libs.versions.minSupportedGradle
     readme = file("README.md")
 }
 
 tasks.check {
-    dependsOn(tasks.named("checkReadme"))
+    dependsOn(checkReadme)
     dependsOn(tasks.named("apiCheck"))
 }

examples/build.gradle

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

examples/build.gradle.kts

@@ -1,26 +1,21 @@
-buildscript {
-    dependencies {
-        classpath "org.jetbrains.kotlinx:kotlinx-benchmark-plugin"
-    }
-}
+import kotlinx.benchmark.gradle.JvmBenchmarkTarget
 
 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 +24,7 @@ benchmark {
     }
     targets {
         register("main") {
+            this as JvmBenchmarkTarget
             jmhVersion = "1.21"
         }
     }

examples/java/build.gradle renamed to examples/java/build.gradle.kts

@@ -42,9 +42,9 @@ dependencies {
 benchmark {
     targets {
         register("benchmarks") {
-            if(this is JvmBenchmarkTarget) {
+            if (this is JvmBenchmarkTarget) {
                 jmhVersion = "1.21"
             }
         }
     }
-}
+}

examples/kotlin/build.gradle.kts

@@ -1,13 +1,13 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+import kotlinx.team.infra.InfraExtension
 
 buildscript {
-    ext.kotlinDevUrl = rootProject.properties["kotlin_repo_url"]
     repositories {
-        maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven' }
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven")
         mavenCentral()
-        if (kotlinDevUrl != null) {
-            maven { url = kotlinDevUrl }
+        val kotlinRepoUrl = providers.gradleProperty("kotlin_repo_url").orNull
+        if (kotlinRepoUrl != null) {
+            maven(kotlinRepoUrl)
         }
     }
 
@@ -21,16 +21,16 @@ buildscript {
 }
 
 plugins {
-    id 'java-gradle-plugin'
-    id 'maven-publish'
+    `java-gradle-plugin`
+    `maven-publish`
     alias(libs.plugins.gradle.pluginPublish)
     alias(libs.plugins.kotlinx.binaryCompatibilityValidator)
     alias(libs.plugins.kotlin.jvm)
 }
 
-apply(plugin: 'kotlinx.team.infra')
+apply(plugin = "kotlinx.team.infra")
 
-infra {
+extensions.configure<InfraExtension> {
     teamcity {
         libraryStagingRepoDescription = project.name
     }
@@ -47,20 +47,21 @@ repositories {
     mavenCentral()
     gradlePluginPortal()
 
-    if (kotlinDevUrl != null) {
-        maven { url = kotlinDevUrl }
+    val kotlinRepoUrl = providers.gradleProperty("kotlin_repo_url").orNull
+    if (kotlinRepoUrl != null) {
+        maven(kotlinRepoUrl)
     }
 }
 
 pluginBundle {
-    website = 'https://github.com/Kotlin/kotlinx-benchmark'
-    vcsUrl = 'https://github.com/Kotlin/kotlinx-benchmark.git'
-    tags = ['benchmarking', 'multiplatform', 'kotlin']
+    website = "https://github.com/Kotlin/kotlinx-benchmark"
+    vcsUrl = "https://github.com/Kotlin/kotlinx-benchmark.git"
+    tags = listOf("benchmarking", "multiplatform", "kotlin")
 }
 
 gradlePlugin {
     plugins {
-        benchmarkPlugin {
+        register("benchmarkPlugin") {
             id = "org.jetbrains.kotlinx.benchmark"
             implementationClass = "kotlinx.benchmark.gradle.BenchmarksPlugin"
             displayName = "Gradle plugin for benchmarking"
@@ -71,24 +72,24 @@ gradlePlugin {
 
 sourceSets {
     main {
-        kotlin.srcDirs = ['main/src']
-        java.srcDirs = ['main/src']
-        resources.srcDirs = ['main/resources']
+        kotlin.srcDirs(listOf("main/src"))
+        java.srcDirs(listOf("main/src"))
+        resources.srcDirs(listOf("main/resources"))
     }
     test {
-        kotlin.srcDirs = ['test/src']
-        java.srcDirs = ['test/src']
-        resources.srcDirs = ['test/resources']
+        kotlin.srcDirs("test/src")
+        java.srcDirs("test/src")
+        resources.srcDirs("test/resources")
     }
 }
 
-tasks.named("compileKotlin", KotlinCompilationTask.class) {
+tasks.compileKotlin {
     compilerOptions {
         optIn.addAll(
                 "kotlinx.benchmark.gradle.internal.KotlinxBenchmarkPluginInternalApi",
                 "kotlin.RequiresOptIn",
         )
-        //noinspection GrDeprecatedAPIUsage
+        @Suppress("DEPRECATION")
         apiVersion = KotlinVersion.KOTLIN_1_4 // the version of Kotlin embedded in Gradle
     }
 }
@@ -107,34 +108,34 @@ dependencies {
     compileOnly(libs.jmh.generatorBytecode) // used in worker
 }
 
-def generatePluginConstants = tasks.register("generatePluginConstants") {
+val generatePluginConstants by tasks.registering {
     description = "Generates constants file used by BenchmarksPlugin"
 
-    File outputDir = temporaryDir
+    val outputDir = temporaryDir
     outputs.dir(outputDir).withPropertyName("outputDir")
 
-    File constantsKtFile = new File(outputDir, "BenchmarksPluginConstants.kt")
+    val constantsKtFile = File(outputDir, "BenchmarksPluginConstants.kt")
 
-    Provider<String> benchmarkPluginVersion = project.providers.gradleProperty("releaseVersion")
+    val benchmarkPluginVersion = project.providers.gradleProperty("releaseVersion")
             .orElse(project.version.toString())
     inputs.property("benchmarkPluginVersion", benchmarkPluginVersion)
 
-    Provider<String> minSupportedGradleVersion = libs.versions.minSupportedGradle
+    val minSupportedGradleVersion = libs.versions.minSupportedGradle
     inputs.property("minSupportedGradleVersion", minSupportedGradleVersion)
 
-    Provider<String> kotlinCompilerVersion = libs.versions.kotlin
+    val kotlinCompilerVersion = libs.versions.kotlin
     inputs.property("kotlinCompilerVersion", kotlinCompilerVersion)
 
     doLast {
-        constantsKtFile.write(
+        constantsKtFile.writeText(
                 """|package kotlinx.benchmark.gradle.internal
                 |
                 |internal object BenchmarksPluginConstants {
                 |  const val BENCHMARK_PLUGIN_VERSION = "${benchmarkPluginVersion.get()}"
                 |  const val MIN_SUPPORTED_GRADLE_VERSION = "${minSupportedGradleVersion.get()}"
                 |  const val DEFAULT_KOTLIN_COMPILER_VERSION = "${kotlinCompilerVersion.get()}"
                 |}
-                |""".stripMargin()
+                |""".trimMargin()
         )
     }
 }
@@ -151,16 +152,16 @@ if (project.findProperty("publication_repository") == "space") {
         repositories {
             maven {
                 name = "space"
-                url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/dev"
+                url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/dev")
                 credentials {
-                    username = project.findProperty("space.user")
-                    password = project.findProperty("space.token")
+                    username = project.findProperty("space.user") as? String?
+                    password = project.findProperty("space.token") as? String?
                 }
             }
         }
     }
 }
 
 apiValidation {
-    nonPublicMarkers += ["kotlinx.benchmark.gradle.internal.KotlinxBenchmarkPluginInternalApi"]
+    nonPublicMarkers += listOf("kotlinx.benchmark.gradle.internal.KotlinxBenchmarkPluginInternalApi")
 }

plugin/build.gradle renamed to plugin/build.gradle.kts

@@ -12,4 +12,4 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = 'kotlinx-benchmark-plugin'
+rootProject.name = "kotlinx-benchmark-plugin"