Fix TC build against the current Kotlin master

Author: Abduqodiri Qurbonzoda

.teamcity/additionalConfiguration.kt

@@ -117,8 +117,14 @@ fun Project.buildWithKotlinMaster(platform: Platform, versionBuild: BuildType) =
             jvmArgs = "-Xmx1g"
             tasks = "clean publishToBuildLocal check"
             // --continue is needed to run tests for all targets even if one target fails
-            gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$teamcitySuffixParameter=%$teamcitySuffixParameter% --continue"
-            gradleParams += " -Pkotlin_repo_url=file://%teamcity.build.checkoutDir%/artifacts/kotlin -Pkotlin_version=%$kotlinVersionParameter% -Pkotlin.native.version=%$kotlinVersionParameter%"
+            gradleParams = listOf(
+                "-x kotlinStoreYarnLock",
+                "--info", "--stacktrace", "--continue",
+                "-P$versionSuffixParameter=%$versionSuffixParameter%", "-P$teamcitySuffixParameter=%$teamcitySuffixParameter%",
+                "-Pkotlin_repo_url=file://%teamcity.build.checkoutDir%/artifacts/kotlin",
+                "-Pkotlin_version=%$kotlinVersionParameter%", "-Pkotlin.native.version=%$kotlinVersionParameter%",
+                "-Pmin_supported_gradle_version=7.6.3"
+            ).joinToString(separator = " ")
             buildFile = ""
             gradleWrapperPath = ""
         }

README.md

@@ -8,9 +8,11 @@
 [![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v?label=Gradle%20Plugin&metadataUrl=https://plugins.gradle.org/m2/org/jetbrains/kotlinx/kotlinx-benchmark-plugin/maven-metadata.xml)](https://plugins.gradle.org/plugin/org.jetbrains.kotlinx.benchmark)
 
 `kotlinx-benchmark` is a toolkit for running benchmarks for multiplatform code written in Kotlin.
-It is designed to work with Kotlin/JVM, Kotlin/JS, Kotlin/Native, and Kotlin/Wasm (experimental) targets.
+It is designed to work with Kotlin/JVM, Kotlin/JS, Kotlin/Native, and Kotlin/WasmJs (experimental) targets.
 
 To get started, ensure you're using Kotlin 2.0.0 or newer and Gradle 7.4 or newer.
+However, because the Kotlin/WasmJs target is experimental and in an active development phase, it guarantees support
+only for the specific Kotlin version used to build the library. For the latest version, this is Kotlin 2.0.20.
 
 ## Features
 

build.gradle.kts

@@ -128,6 +128,7 @@ apiValidation {
 }
 
 val checkReadme by tasks.registering(CheckReadmeTask::class) {
+    enabled = providers.gradleProperty("min_supported_gradle_version").orNull.isNullOrBlank()
     minSupportedGradleVersion = libs.versions.minSupportedGradle
     minSupportedKotlinVersion = libs.versions.minSupportedKotlin
     readme = file("README.md")

gradle/libs.versions.toml

@@ -9,6 +9,7 @@ squareup-kotlinpoet = "1.3.0"
 jmh = "1.21"
 gradle-pluginPublish = "0.21.0"
 
+# Note: This version can be overridden by passing `-Pmin_supported_gradle_version=<version>`
 minSupportedGradle = "7.4"
 minSupportedKotlin = "2.0.0"
 

integration/src/main/kotlin/kotlinx/benchmark/integration/GradleTestVersion.kt

@@ -2,7 +2,7 @@ package kotlinx.benchmark.integration
 
 enum class GradleTestVersion(val versionString: String) {
     v8_0("8.0.2"),
-    MinSupportedGradleVersion("7.4"),
+    MinSupportedGradleVersion(System.getProperty("minSupportedGradleVersion")),
     UnsupportedGradleVersion("7.3"),
     MinSupportedKotlinVersion("2.0.0"),
     UnsupportedKotlinVersion("1.9.20"),

integration/src/test/kotlin/kotlinx/benchmark/integration/WasmGcOptionsTest.kt

@@ -12,7 +12,9 @@ class WasmGcOptionsTest : GradleTest() {
         val runner = project(
             "wasm-gc-non-experimental/wasm-d8",
             print = true,
-            kotlinVersion = GradleTestVersion.MinSupportedKotlinVersion.versionString
+            // While Kotlin/Wasm is in active development phase, only matching versions are supported.
+            // Hence, use the current Kotlin version instead of the minimum supported version.
+//            kotlinVersion = GradleTestVersion.MinSupportedKotlinVersion.versionString
         )
         runner.runAndSucceed( "wasmJsBenchmark")
     }

settings.gradle.kts

@@ -11,12 +11,17 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            val kotlinVersion = providers.gradleProperty("kotlin_version").orNull
-            if (!kotlinVersion.isNullOrBlank()) {
-                // Override the default Kotlin version.
-                // The only intended use-case is for testing dev Kotlin builds using kotlinx-benchmark.
-                // The Kotlin version should not be overridden during regular development.
-                version("kotlin", kotlinVersion)
+            listOf(
+                "kotlin" to "kotlin_version",
+                "minSupportedGradle" to "min_supported_gradle_version",
+            ).forEach { (versionName, propertyName) ->
+                val overrideVersion = providers.gradleProperty(propertyName).orNull
+                if (!overrideVersion.isNullOrBlank()) {
+                    // Override the default version.
+                    // The only intended use-case is for testing dev Kotlin builds using kotlinx-benchmark.
+                    // These versions should not be overridden during regular development.
+                    version(versionName, overrideVersion)
+                }
             }
         }
     }