From 063dcea2e2096feb2228dc06b3d1cb740f2588db Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Fri, 2 Dec 2022 14:01:01 +0100
Subject: [PATCH] [Gradle] Access MppTestReportHelper factory directly instead
 of providers

Workaround for KT-55241
---
 .../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 827dae21621..150ea1beb97 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
@@ -11,7 +11,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.testing.Test
 import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper
-import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactoryProvider
+import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactory
 
 @CacheableTask
 open class KotlinJvmTest : Test() {
@@ -20,14 +20,14 @@ open class KotlinJvmTest : Test() {
     var targetName: String? = null
 
     private val testReporter = project.gradle
-        .variantImplementationFactoryProvider<MppTestReportHelper.MppTestReportHelperVariantFactory>()
-        .map { it.getInstance() }
+        .variantImplementationFactory<MppTestReportHelper.MppTestReportHelperVariantFactory>()
+        .getInstance()
 
     override fun createTestExecuter(): TestExecuter<JvmTestExecutionSpec> =
         if (targetName != null) Executor(
             super.createTestExecuter(),
             targetName!!,
-            testReporter.get(),
+            testReporter,
         )
         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 a97c28bb369..8daf9e46078 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
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.internal.testing.KotlinTestRunnerListener
 import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutor
 import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
 import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper
-import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactoryProvider
+import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactory
 import org.jetbrains.kotlin.gradle.utils.injected
 import javax.inject.Inject
 
@@ -65,8 +65,8 @@ abstract class KotlinTest : AbstractTestTask() {
     }
 
     private val testReporter = project.gradle
-        .variantImplementationFactoryProvider<MppTestReportHelper.MppTestReportHelperVariantFactory>()
-        .map { it.getInstance() }
+        .variantImplementationFactory<MppTestReportHelper.MppTestReportHelperVariantFactory>()
+        .getInstance()
 
     override fun createTestExecuter() = TCServiceMessagesTestExecutor(
         execHandleFactory,
@@ -74,6 +74,6 @@ abstract class KotlinTest : AbstractTestTask() {
         runListeners,
         ignoreTcsmOverflow,
         ignoreRunFailures,
-        testReporter.get(),
+        testReporter,
     )
 }