From 8b12b3f18d86e024f6105be1d577aca16297d035 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 17 Mar 2023 18:49:14 +0100
Subject: [PATCH] Minor: remove code from top-level and move to task
 configurations

---
 compiler/android-tests/build.gradle.kts             |  8 ++++----
 .../build.gradle.kts                                | 13 ++++++-------
 .../build.gradle.kts                                |  8 +++-----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index f365d2fcb6a..d78563bfcfd 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -57,7 +57,7 @@ projectTest {
     useAndroidEmulator(this)
 }
 
-val generateAndroidTests by generator("org.jetbrains.kotlin.android.tests.CodegenTestsOnAndroidGenerator")
-
-generateAndroidTests.workingDir = rootDir
-generateAndroidTests.dependsOn(rootProject.tasks.named("dist"))
+val generateAndroidTests by generator("org.jetbrains.kotlin.android.tests.CodegenTestsOnAndroidGenerator") {
+    workingDir = rootDir
+    dependsOn(rootProject.tasks.named("dist"))
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
index c3e5e4d3ec9..68da0476b1f 100644
--- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts
@@ -15,6 +15,7 @@ val generateMppTargetContainerWithPresets by generator(
     sourceSets["main"]
 ) {
     group = generateGroupName
+    setOutputSourceRoot()
 }
 
 val generateAbstractBinaryContainer by generator(
@@ -22,6 +23,7 @@ val generateAbstractBinaryContainer by generator(
     sourceSets["main"]
 ) {
     group = generateGroupName
+    setOutputSourceRoot()
 }
 
 val generateAbstractKotlinArtifactsExtensionImplementation by generator(
@@ -29,10 +31,7 @@ val generateAbstractKotlinArtifactsExtensionImplementation by generator(
     sourceSets["main"]
 ) {
     group = generateGroupName
-    systemProperty(
-        "org.jetbrains.kotlin.generators.gradle.dsl.outputSourceRoot",
-        project(":kotlin-gradle-plugin").projectDir.resolve("src/common/kotlin").absolutePath
-    )
+    setOutputSourceRoot()
 }
 
 val generateKpmNativeVariants by generator(
@@ -40,12 +39,12 @@ val generateKpmNativeVariants by generator(
     sourceSets["main"]
 ) {
     group = generateGroupName
+    setOutputSourceRoot()
 }
 
-listOf(generateMppTargetContainerWithPresets, generateAbstractBinaryContainer, generateKpmNativeVariants).forEach {
-    it.systemProperty(
+fun JavaExec.setOutputSourceRoot() {
+    systemProperty(
         "org.jetbrains.kotlin.generators.gradle.dsl.outputSourceRoot",
         project(":kotlin-gradle-plugin").projectDir.resolve("src/common/kotlin").absolutePath
     )
 }
-
diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts
index 192ee96a219..178b2c8c1b1 100644
--- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts
@@ -12,11 +12,9 @@ dependencies {
 val generateNpmVersions by generator(
     "org.jetbrains.kotlin.generators.gradle.targets.js.MainKt",
     sourceSets["main"]
-)
-
-listOf(generateNpmVersions).forEach {
-    it.systemProperty(
+) {
+    systemProperty(
         "org.jetbrains.kotlin.generators.gradle.targets.js.outputSourceRoot",
         project(":kotlin-gradle-plugin").projectDir.resolve("src/common/kotlin").absolutePath
     )
-}
+}
\ No newline at end of file