Minor: remove code from top-level and move to task configurations

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"))
+}

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
     )
 }
-

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
     )
-}
+}