azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Access MppTestReportHelper factory directly instead of providers

Browse Source 
Workaround for KT-55241
This commit is contained in:
Alexander Likhachev
2022-12-02 14:01:01 +01:00
committed by Space Team
parent cb53d0c388
commit 063dcea2e2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt
+4 -4
View File
@@ -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()
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt
+4 -4
View File
@@ -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,
)
}