[Build] Align Gradle-related modules stdlib with the API version

This change also slightly reworks API and language version configuration. Instead of limiting them for all Kotlin compile tasks in the project, configure them granularly, only for "main" or other published parts. This allows to use fresh Kotlin for tests.
Also fixes warnings in test code related to LV bump there.
^KT-61911 Fixed

Author: ALikhachev

gradle/verification-metadata.xml

@@ -4254,12 +4254,6 @@
             <sha256 value="9dff2645dd3d2f9f0b807f960f0e6b203affa999c02ae5727aaf0a792ba111e8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-serialization-compiler-plugin-embeddable" version="2.1.0">
-         <artifact name="kotlin-serialization-compiler-plugin-embeddable-2.1.0.jar">
-            <md5 value="2788404aebafd09f657d905bba8d6e5f" origin="Generated by Gradle"/>
-            <sha256 value="c6032f2f87a9ae8ae7ad301987be1732c6cacfacb60eb89a77408fe5b2de7fc5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-serialization-compiler-plugin-embeddable" version="2.2.0-dev-12941">
          <artifact name="kotlin-serialization-compiler-plugin-embeddable-2.2.0-dev-12941.jar">
             <md5 value="0bec8191feb7f80f8dac4904af5d9e1f" origin="Generated by Gradle"/>
@@ -4272,6 +4266,12 @@
             <sha256 value="115daea30b0d484afcf2360237b9d9537f48a4a2f03f3cc2a16577dfc6e90342" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.7.0">
+         <artifact name="kotlin-stdlib-1.7.0.jar">
+            <md5 value="400a2d86759907bef5b467fb258eb759" origin="Generated by Gradle"/>
+            <sha256 value="aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.20">
          <artifact name="kotlin-stdlib-1.8.20.jar">
             <md5 value="2b3d65e24952649bf7534017c64b435e" origin="Generated by Gradle"/>
@@ -4358,6 +4358,12 @@
             <sha256 value="644a7257c23b51a1fd5068960e40922e3e52c219f11ece3e040a3abc74823f22" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.7.0">
+         <artifact name="kotlin-stdlib-common-1.7.0.jar">
+            <md5 value="a0da9b73af82169a86df0c442dce3232" origin="Generated by Gradle"/>
+            <sha256 value="59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.20">
          <artifact name="kotlin-stdlib-common-1.8.20.jar">
             <md5 value="af45a8873880f027f47d573e1483a6dc" origin="Generated by Gradle"/>

libraries/tools/kotlin-compose-compiler/build.gradle.kts

@@ -52,6 +52,7 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
                 dependencies {
                     implementation(project())
                     implementation(gradleKotlinDsl())
+                    implementation(project(":compiler:cli-common"))
                     implementation(platform(libs.junit.bom))
                     implementation(libs.junit.jupiter.api)
                     implementation(project(":kotlin-test"))

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -541,7 +541,7 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
     }
 
     functionalTestCompilation.configurations.pluginConfiguration.dependencies.add(
-        dependencies.create("org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:${libs.versions.kotlin.`for`.gradle.plugins.compilation.get()}")
+        dependencies.create("org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable")
     )
     functionalTestCompilation.associateWith(kotlin.target.compilations.getByName(gradlePluginVariantForFunctionalTests.sourceSetName))
     functionalTestCompilation.associateWith(kotlin.target.compilations.getByName("common"))

libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/PropertiesBuildServiceTest.kt

@@ -102,7 +102,6 @@ class PropertiesBuildServiceTest {
                 is PropertiesBuildService.NullableStringGradleProperty -> properties.property(property, project).orNull
                 is PropertiesBuildService.IntGradleProperty -> properties.property(property, project).get()
                 is PropertiesBuildService.NullableBooleanGradleProperty -> properties.property(property, project).orNull
-                else -> error("Unexpected property type ${property::class}")
             }
         )
     }

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt

@@ -21,6 +21,7 @@ import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.plugins.JavaLibraryPlugin
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
@@ -38,10 +39,10 @@ import org.gradle.plugin.devel.tasks.ValidatePlugins
 import org.gradle.plugin.use.resolve.internal.ArtifactRepositoriesPluginResolver.PLUGIN_MARKER_SUFFIX
 import org.jetbrains.kotlin.gradle.dsl.KotlinSingleJavaTargetExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilerExecutionStrategy
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import plugins.configureDefaultPublishing
 import plugins.configureKotlinPomAttributes
 
@@ -157,7 +158,7 @@ fun Project.createGradleCommonSourceSet(): SourceSet {
         configurations[compileClasspathConfigurationName].extendsFrom(commonGradleApiConfiguration)
 
         dependencies {
-            compileOnlyConfigurationName(kotlinStdlib())
+            compileOnlyConfigurationName("org.jetbrains.kotlin:kotlin-stdlib:${GradlePluginVariant.GRADLE_MIN.bundledKotlinVersion}.0")
             "commonGradleApiCompileOnly"(gradleApi())
             if (this@createGradleCommonSourceSet.name !in testPlugins) {
                 compileOnlyConfigurationName(project(":kotlin-gradle-plugin-api")) {
@@ -177,11 +178,13 @@ fun Project.createGradleCommonSourceSet(): SourceSet {
             }
         }
     }
-
-    // Common outputs will also produce '${project.name}.kotlin_module' file, so we need to avoid
-    // files clash
-    tasks.named<KotlinJvmCompile>("compile${commonSourceSet.name.replaceFirstChar { it.uppercase() }}Kotlin") {
+    val kotlinJvmTarget = (extensions.getByName("kotlin") as KotlinSingleJavaTargetExtension).target
+    val compilation = kotlinJvmTarget.compilations.getByName(commonSourceSet.name)
+    tasks.named<KotlinCompile>(compilation.compileKotlinTaskName) {
+        // Common outputs will also produce '${project.name}.kotlin_module' file, so we need to avoid
+        // files clash
         compilerOptions.moduleName.set("${this@createGradleCommonSourceSet.name}_${commonSourceSet.name}")
+        configureGradleCompatibility()
     }
 
     registerValidatePluginTasks(commonSourceSet)
@@ -305,7 +308,7 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
         }
 
         dependencies {
-            "compileOnly"(kotlinStdlib())
+            "compileOnly"("org.jetbrains.kotlin:kotlin-stdlib:${GradlePluginVariant.GRADLE_MIN}.0")
             // Decoupling gradle-api artifact from current project Gradle version. Later would be useful for
             // gradle plugin variants
             "compileOnly"("dev.gradleplugins:gradle-api:${GradlePluginVariant.GRADLE_MIN.gradleApiVersion}")
@@ -428,14 +431,20 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
             }
     }
 
+    val kotlinJvmTarget = (extensions.getByName("kotlin") as KotlinSingleJavaTargetExtension).target
+    val mainCompilation = kotlinJvmTarget.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME)
+    tasks.named<KotlinCompile>(mainCompilation.compileKotlinTaskName) {
+        configureGradleCompatibility()
+    }
+
     // Fix common sources visibility for tests
     sourceSets.named(SourceSet.TEST_SOURCE_SET_NAME) {
         compileClasspath += commonSourceSet.output
         runtimeClasspath += commonSourceSet.output
     }
 
     // Allowing to use 'internal' classes/methods from common source code
-    (extensions.getByName("kotlin") as KotlinSingleJavaTargetExtension).target.compilations.run {
+    kotlinJvmTarget.compilations.run {
         getByName(SourceSet.TEST_SOURCE_SET_NAME).associateWith(getByName(commonSourceSet.name))
     }
 }
@@ -505,13 +514,16 @@ fun Project.createGradlePluginVariant(
         }
     }
 
-    // KT-52138: Make module name the same for all variants, so KSP could access internal methods/properties
-    tasks.named<KotlinJvmCompile>("compile${variantSourceSet.name.replaceFirstChar { it.uppercase() }}Kotlin") {
+    val kotlinJvmTarget = (extensions.getByName("kotlin") as KotlinSingleJavaTargetExtension).target
+    val compilation = kotlinJvmTarget.compilations.getByName(variantSourceSet.name)
+    tasks.named<KotlinCompile>(compilation.compileKotlinTaskName) {
+        // KT-52138: Make module name the same for all variants, so KSP could access internal methods/properties
         compilerOptions.moduleName.set(this@createGradlePluginVariant.name)
+        configureGradleCompatibility()
     }
 
     dependencies {
-        variantSourceSet.compileOnlyConfigurationName(kotlinStdlib())
+        variantSourceSet.compileOnlyConfigurationName("org.jetbrains.kotlin:kotlin-stdlib:${GradlePluginVariant.GRADLE_MIN.bundledKotlinVersion}.0")
         if (variant == GradlePluginVariant.GRADLE_813) {
             // Workaround until 'dev.gradleplugins:gradle-api:8.13' will be published
             variantSourceSet.compileOnlyConfigurationName("org.jetbrains.intellij.deps:gradle-api:${variant.gradleApiVersion}")
@@ -546,37 +558,65 @@ private fun Project.commonVariantAttributes(): Action<Configuration> = Action<Co
     }
 }
 
-fun Project.configureKotlinCompileTasksGradleCompatibility() {
-    tasks.withType<KotlinCompile>().configureEach {
-        compilerOptions {
-            if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
-                // check https://docs.gradle.org/current/userguide/compatibility.html#kotlin for Kotlin-Gradle versions matrix
-                @Suppress("DEPRECATION", "DEPRECATION_ERROR") // we can't use language version greater than 1.8 as our minimal supported Gradle 7.6 embeds Kotlin 1.7.10
-                languageVersion.set(KotlinVersion.KOTLIN_1_7)
-                @Suppress("DEPRECATION", "DEPRECATION_ERROR") // we can't use api version greater than 1.7 as our minimal supported Gradle version 7.6 uses kotlin-stdlib 1.7
-                apiVersion.set(KotlinVersion.KOTLIN_1_7)
-            }
-            freeCompilerArgs.addAll(
-                listOf(
-                    "-Xskip-prerelease-check",
-                    "-Xsuppress-version-warnings",
-                    // We have to override the default value for `-Xsam-conversions` to `class`
-                    // otherwise the compiler would compile lambdas using invokedynamic,
-                    // such lambdas are not serializable so are not compatible with Gradle configuration cache.
-                    // It doesn't lead to a significant difference in binaries sizes, and previously (before LV 1.5) the `class` value was set by default.
-                    "-Xsam-conversions=class",
-                )
-            )
+/**
+ * Configures the JVM compile task to produce binaries compatible with [GradlePluginVariant.GRADLE_MIN].
+ */
+fun KotlinCompile.configureGradleCompatibility() {
+    configureRunViaKotlinBuildToolsApi()
+    compilerOptions {
+        if (!project.kotlinBuildProperties.isInJpsBuildIdeaSync) {
+            val variant = GradlePluginVariant.GRADLE_MIN
+            // we should keep control of the language version for compatibility with bundled Kotlin compiler for Gradle Kotlin scripts.
+            languageVersion.set(KotlinVersion.fromVersion(variant.bundledKotlinVersion))
+            // we should not use stdlib symbols not available in the bundled Kotlin runtime
+            apiVersion.set(KotlinVersion.fromVersion(variant.bundledKotlinVersion))
         }
+        freeCompilerArgs.addAll(
+            listOf(
+                "-Xskip-prerelease-check",
+                "-Xsuppress-version-warnings",
+                // We have to override the default value for `-Xsam-conversions` to `class`
+                // otherwise the compiler would compile lambdas using invokedynamic,
+                // such lambdas are not serializable so are not compatible with Gradle configuration cache.
+                // It doesn't lead to a significant difference in binaries sizes, and previously (before LV 1.5) the `class` value was set by default.
+                "-Xsam-conversions=class",
+            )
+        )
     }
-    configureRunViaKotlinBuildToolsApi()
 }
 
-fun Project.configureRunViaKotlinBuildToolsApi() {
-    project.extra["kotlin.compiler.runViaBuildToolsApi"] = true
-    tasks.withType<KotlinCompile>().configureEach {
-        compilerExecutionStrategy.set(KotlinCompilerExecutionStrategy.IN_PROCESS)
+/**
+ * Configures the main JVM compile task in the project to use specific setup for compatibility with [GradlePluginVariant.GRADLE_MIN]
+ * If you need to configure it for specific tasks, please use [configureGradleCompatibility] and [configureBuildToolsApiVersionForGradleCompatibility].
+ */
+fun Project.configureKotlinCompileTasksGradleCompatibility() {
+    tasks.named("compileKotlin", KotlinCompile::class.java) {
+        configureGradleCompatibility()
     }
+    configureBuildToolsApiVersionForGradleCompatibility()
+}
+
+/**
+ * Configures the task to execute the Kotlin compiler via the Kotlin Build Tools API.
+ *
+ * This way, we use an older bootstrap compiler controlled by the `kotlin-for-gradle-plugins-compilation`
+ * version catalog entry to ensure compatibility with older language versions
+ *
+ * It's using reflection to access internal property instead of the `kotlin.compiler.runViaBuildToolsApi` property to avoid using it for test source sets.
+ * This way, we can the latest AV/LV in test code as well as dependencies built with them.
+ */
+private fun KotlinCompile.configureRunViaKotlinBuildToolsApi() {
+    val runViaBuildToolsMethod = this::class.java.getMethod("getRunViaBuildToolsApi\$kotlin_gradle_plugin_common")
+    @Suppress("UNCHECKED_CAST") val runViaBuildTools = runViaBuildToolsMethod.invoke(this) as Property<Boolean>
+    runViaBuildTools.set(true)
+    compilerExecutionStrategy.set(KotlinCompilerExecutionStrategy.IN_PROCESS)
+}
+
+/**
+ * Configures the build tools API version for the project to use Kotlin compiler of the version
+ * that can produce binaries of [GradlePluginVariant.bundledKotlinVersion] for [GradlePluginVariant.GRADLE_MIN]
+ */
+fun Project.configureBuildToolsApiVersionForGradleCompatibility() {
     afterEvaluate {
         val gradlePluginsBuildToolsApiClasspath by rootProject.buildscript.configurations
         configurations.findByName("kotlinBuildToolsApiClasspath")?.let {

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts

@@ -17,7 +17,7 @@ val signPublication = !version.toString().contains("-SNAPSHOT") &&
         (project.gradle.startParameter.taskNames.contains("publishPlugins") || signLibraryPublication)
 
 configureCommonPublicationSettingsForGradle(signPublication)
-configureKotlinCompileTasksGradleCompatibility()
+configureBuildToolsApiVersionForGradleCompatibility()
 addBomCheckTask()
 extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
 

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 configureCommonPublicationSettingsForGradle(signLibraryPublication)
-configureKotlinCompileTasksGradleCompatibility()
+configureBuildToolsApiVersionForGradleCompatibility()
 addBomCheckTask()
 extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
 

repo/gradle-build-conventions/gradle-plugins-common/src/main/kotlin/gradle/GradlePluginVariant.kt

@@ -7,24 +7,27 @@ package gradle
 
 /**
  * Gradle's plugins common variants.
+ * See also the compatibility matrix: https://docs.gradle.org/current/userguide/compatibility.html#kotlin
  *
- * [minimalSupportedGradleVersion] - minimal Gradle version that is supported in this variant
+ * [minimalSupportedGradleVersion] - Minimal Gradle version that is supported in this variant
  * [gradleApiVersion] - Gradle API dependency version. Usually should be the same as [minimalSupportedGradleVersion].
- * [gradleApiJavadocUrl] - Gradle URL for the given API. Last enum entry should always point to 'current'.
+ * [gradleApiJavadocUrl] - Gradle URL for the given API.The last enum entry should always point to 'current'.
+ * [bundledKotlinVersion] - The version of the bundled Kotlin. Used to control the kotlin-stdlib version and the values of `-api-version`, `-language-version` arguments
  */
 enum class GradlePluginVariant(
     val sourceSetName: String,
     val minimalSupportedGradleVersion: String,
     val gradleApiVersion: String,
     val gradleApiJavadocUrl: String,
+    val bundledKotlinVersion: String,
 ) {
-    GRADLE_MIN("main", "7.6", "7.6", "https://docs.gradle.org/7.6.1/javadoc/"),
-    GRADLE_80("gradle80", "8.0", "8.0", "https://docs.gradle.org/8.0.2/javadoc/"),
-    GRADLE_81("gradle81", "8.1", "8.1", "https://docs.gradle.org/8.1.1/javadoc/"),
-    GRADLE_82("gradle82", "8.2", "8.2", "https://docs.gradle.org/8.2.1/javadoc/"),
-    GRADLE_85("gradle85", "8.5", "8.5", "https://docs.gradle.org/8.5/javadoc/"),
-    GRADLE_86("gradle86", "8.6", "8.6", "https://docs.gradle.org/8.6/javadoc/"),
-    GRADLE_88("gradle88", "8.8", "8.8", "https://docs.gradle.org/8.8/javadoc/"),
-    GRADLE_811("gradle811", "8.11", "8.11", "https://docs.gradle.org/8.11/javadoc/"),
-    GRADLE_813("gradle813", "8.13", "8.13", "https://docs.gradle.org/current/javadoc/"),
+    GRADLE_MIN("main", "7.6", "7.6", "https://docs.gradle.org/7.6.1/javadoc/", "1.7"),
+    GRADLE_80("gradle80", "8.0", "8.0", "https://docs.gradle.org/8.0.2/javadoc/", "1.8"),
+    GRADLE_81("gradle81", "8.1", "8.1", "https://docs.gradle.org/8.1.1/javadoc/", "1.8"),
+    GRADLE_82("gradle82", "8.2", "8.2", "https://docs.gradle.org/8.2.1/javadoc/", "1.8"),
+    GRADLE_85("gradle85", "8.5", "8.5", "https://docs.gradle.org/8.5/javadoc/", "1.9"),
+    GRADLE_86("gradle86", "8.6", "8.6", "https://docs.gradle.org/8.6/javadoc/", "1.9"),
+    GRADLE_88("gradle88", "8.8", "8.8", "https://docs.gradle.org/8.8/javadoc/", "1.9"),
+    GRADLE_811("gradle811", "8.11", "8.11", "https://docs.gradle.org/8.11/javadoc/", "2.0"),
+    GRADLE_813("gradle813", "8.13", "8.13", "https://docs.gradle.org/current/javadoc/", "2.0"),
 }