Remove deprecated ConfigureUtil usages in KotlinAggregatingExecution

^KT-46019 In Progress

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/execution/KotlinAggregateExecutionSource.kt

@@ -5,8 +5,7 @@
 
 package org.jetbrains.kotlin.gradle.execution
 
-import groovy.lang.Closure
+import org.gradle.api.Action
-import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.plugin.KotlinExecution
 import org.jetbrains.kotlin.gradle.plugin.KotlinExecution.ExecutionSource
 
@@ -35,10 +34,7 @@ interface KotlinAggregatingExecution<
      */
     fun getConfiguredExecutions(): Iterable<AggregatedExecutionType>
 
-    fun configureAllExecutions(configureClosure: Closure<*>) = configureAllExecutions {
+    fun configureAllExecutions(configure: Action<AggregatedExecutionType>) = configureAllExecutions {
-        ConfigureUtil.configureSelf(
+        configure.execute(this)
-            configureClosure,
-            this
-        )
     }
 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.testing.KotlinReportAggregatingTestRun
 import org.jetbrains.kotlin.gradle.testing.KotlinTaskTestRun
 import org.jetbrains.kotlin.gradle.testing.requireCompilationOfTarget
+import javax.inject.Inject
 import kotlin.properties.Delegates
 
 class JsCompilationExecutionSource(override val compilation: KotlinJsCompilation) :
@@ -51,7 +52,7 @@ class JsAggregatingExecutionSource(private val aggregatingTestRun: KotlinJsRepor
         get() = aggregatingTestRun.getConfiguredExecutions().map { it.executionSource }
 }
 
-open class KotlinJsReportAggregatingTestRun(
+abstract class KotlinJsReportAggregatingTestRun @Inject constructor(
     testRunName: String,
     override val target: KotlinJsSubTargetContainerDsl
 ) : KotlinReportAggregatingTestRun<JsCompilationExecutionSource, JsAggregatingExecutionSource, KotlinJsPlatformTestRun>(testRunName),

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt

@@ -30,7 +30,11 @@ open class KotlinJsTargetConfigurator :
         name: String,
         target: KotlinJsTarget
     ): KotlinJsReportAggregatingTestRun {
-        val result = KotlinJsReportAggregatingTestRun(name, target)
+        val result = target.project.objects.newInstance(
+            KotlinJsReportAggregatingTestRun::class.java,
+            name,
+            target
+        )
 
         val testTask = target.project.kotlinTestRegistry.getOrCreateAggregatedTestTask(
             name = result.testTaskName,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt

@@ -35,7 +35,11 @@ open class KotlinJsIrTargetConfigurator() :
         name: String,
         target: KotlinJsIrTarget
     ): KotlinJsReportAggregatingTestRun {
-        val result = KotlinJsReportAggregatingTestRun(name, target)
+        val result = target.project.objects.newInstance(
+            KotlinJsReportAggregatingTestRun::class.java,
+            name,
+            target
+        )
 
         val testTask = target.project.kotlinTestRegistry.getOrCreateAggregatedTestTask(
             name = result.testTaskName,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/testing/KotlinAggregateExecutionSource.kt

@@ -9,7 +9,6 @@ import groovy.lang.Closure
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.testing.AbstractTestTask
 import org.gradle.api.tasks.testing.TestFilter
-import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.execution.KotlinAggregateExecutionSource
 import org.jetbrains.kotlin.gradle.execution.KotlinAggregatingExecution
 import org.jetbrains.kotlin.gradle.plugin.*