From 93a1d61a301c25a89207bc14153deb1e1ed5f099 Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Tue, 24 Jan 2023 23:31:19 +0100
Subject: [PATCH] [Gradle] Use variant factories provider in KotlinJvmTest and
 KotlinTest

Reverts 063dcea2e2096feb2228dc06b3d1cb740f2588db
KT-55241 Related
---
 .../kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt      | 8 ++++----
 .../org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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<MppTestReportHelper.MppTestReportHelperVariantFactory>()
-        .getInstance()
+        .variantImplementationFactoryProvider<MppTestReportHelper.MppTestReportHelperVariantFactory>()
+        .map { it.getInstance() }
 
     override fun createTestExecuter(): TestExecuter<JvmTestExecutionSpec> =
         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<MppTestReportHelper.MppTestReportHelperVariantFactory>()
-        .getInstance()
+        .variantImplementationFactoryProvider<MppTestReportHelper.MppTestReportHelperVariantFactory>()
+        .map { it.getInstance() }
 
     override fun createTestExecuter() = TCServiceMessagesTestExecutor(
         execHandleFactory,
@@ -75,6 +75,6 @@ abstract class KotlinTest : AbstractTestTask(), UsesVariantImplementationFactori
         runListeners,
         ignoreTcsmOverflow,
         ignoreRunFailures,
-        testReporter,
+        testReporter.get(),
     )
 }