From 4b0ba493b71a93505bbf0d7afeaa45228dccdc34 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 27 Jun 2022 23:19:06 +0200 Subject: [PATCH] Remove deprecated ConfigureUtil usages in KotlinAggregatingExecution ^KT-46019 In Progress --- .../gradle/execution/KotlinAggregateExecutionSource.kt | 10 +++------- .../gradle/targets/js/KotlinJsPlatformTestRun.kt | 3 ++- .../gradle/targets/js/KotlinJsTargetConfigurator.kt | 6 +++++- .../targets/js/ir/KotlinJsIrTargetConfigurator.kt | 6 +++++- .../gradle/testing/KotlinAggregateExecutionSource.kt | 1 - 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/execution/KotlinAggregateExecutionSource.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/execution/KotlinAggregateExecutionSource.kt index c33fbdab731..10f607717a2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/execution/KotlinAggregateExecutionSource.kt +++ b/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.util.ConfigureUtil +import org.gradle.api.Action import org.jetbrains.kotlin.gradle.plugin.KotlinExecution import org.jetbrains.kotlin.gradle.plugin.KotlinExecution.ExecutionSource @@ -35,10 +34,7 @@ interface KotlinAggregatingExecution< */ fun getConfiguredExecutions(): Iterable - fun configureAllExecutions(configureClosure: Closure<*>) = configureAllExecutions { - ConfigureUtil.configureSelf( - configureClosure, - this - ) + fun configureAllExecutions(configure: Action) = configureAllExecutions { + configure.execute(this) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt index b0d5485e942..e0803639a0d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt +++ b/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(testRunName), diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt index c70e206a3c8..e414ce97504 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt +++ b/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, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt index f1cd3eec953..4e0671d413d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt +++ b/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, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/testing/KotlinAggregateExecutionSource.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/testing/KotlinAggregateExecutionSource.kt index 3cee23bac42..c0d4912d808 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/testing/KotlinAggregateExecutionSource.kt +++ b/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.*