diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt index d00c411fd60..9b504b7a446 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt @@ -12,7 +12,7 @@ import org.gradle.api.tasks.Optional import org.gradle.api.tasks.testing.Test import org.jetbrains.kotlin.gradle.plugin.UsesVariantImplementationFactories import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper -import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactory +import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactoryProvider @CacheableTask open class KotlinJvmTest : Test(), UsesVariantImplementationFactories { @@ -21,14 +21,14 @@ open class KotlinJvmTest : Test(), UsesVariantImplementationFactories { var targetName: String? = null private val testReporter = project - .variantImplementationFactory() - .getInstance() + .variantImplementationFactoryProvider() + .map { it.getInstance() } override fun createTestExecuter(): TestExecuter = if (targetName != null) Executor( super.createTestExecuter(), targetName!!, - testReporter, + testReporter.get(), ) else super.createTestExecuter() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt index 661bdff455a..0534a7dbad8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuto import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.UsesVariantImplementationFactories import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper -import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactory +import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactoryProvider import org.jetbrains.kotlin.gradle.utils.injected import javax.inject.Inject @@ -66,8 +66,8 @@ abstract class KotlinTest : AbstractTestTask(), UsesVariantImplementationFactori } private val testReporter = project - .variantImplementationFactory() - .getInstance() + .variantImplementationFactoryProvider() + .map { it.getInstance() } override fun createTestExecuter() = TCServiceMessagesTestExecutor( execHandleFactory, @@ -75,6 +75,6 @@ abstract class KotlinTest : AbstractTestTask(), UsesVariantImplementationFactori runListeners, ignoreTcsmOverflow, ignoreRunFailures, - testReporter, + testReporter.get(), ) }