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

[Gradle] Use variant factories provider in KotlinJvmTest and KotlinTest

Browse Source 
Reverts 063dcea2e2
KT-55241 Related
This commit is contained in:
Alexander.Likhachev
2023-01-24 23:31:19 +01:00
parent 1565c800d9
commit 93a1d61a30
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
@@ -12,7 +12,7 @@ import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.Test
import org.jetbrains.kotlin.gradle.plugin.UsesVariantImplementationFactories import org.jetbrains.kotlin.gradle.plugin.UsesVariantImplementationFactories
import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper
import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactory import org.jetbrains.kotlin.gradle.plugin.variantImplementationFactoryProvider
@CacheableTask @CacheableTask
open class KotlinJvmTest : Test(), UsesVariantImplementationFactories { open class KotlinJvmTest : Test(), UsesVariantImplementationFactories {
@@ -21,14 +21,14 @@ open class KotlinJvmTest : Test(), UsesVariantImplementationFactories {
var targetName: String? = null var targetName: String? = null
private val testReporter = project private val testReporter = project
.variantImplementationFactory<MppTestReportHelper.MppTestReportHelperVariantFactory>() .variantImplementationFactoryProvider<MppTestReportHelper.MppTestReportHelperVariantFactory>()
.getInstance() .map { it.getInstance() }
override fun createTestExecuter(): TestExecuter<JvmTestExecutionSpec> = override fun createTestExecuter(): TestExecuter<JvmTestExecutionSpec> =
if (targetName != null) Executor( if (targetName != null) Executor(
super.createTestExecuter(), super.createTestExecuter(),
targetName!!, targetName!!,
testReporter, testReporter.get(),
) )
else super.createTestExecuter() else super.createTestExecuter()
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt
+4 -4
View File
@@ -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.PropertiesProvider
import org.jetbrains.kotlin.gradle.plugin.UsesVariantImplementationFactories import org.jetbrains.kotlin.gradle.plugin.UsesVariantImplementationFactories
import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper 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 org.jetbrains.kotlin.gradle.utils.injected
import javax.inject.Inject import javax.inject.Inject
@@ -66,8 +66,8 @@ abstract class KotlinTest : AbstractTestTask(), UsesVariantImplementationFactori
} }
private val testReporter = project private val testReporter = project
.variantImplementationFactory<MppTestReportHelper.MppTestReportHelperVariantFactory>() .variantImplementationFactoryProvider<MppTestReportHelper.MppTestReportHelperVariantFactory>()
.getInstance() .map { it.getInstance() }
override fun createTestExecuter() = TCServiceMessagesTestExecutor( override fun createTestExecuter() = TCServiceMessagesTestExecutor(
execHandleFactory, execHandleFactory,
@@ -75,6 +75,6 @@ abstract class KotlinTest : AbstractTestTask(), UsesVariantImplementationFactori
runListeners, runListeners,
ignoreTcsmOverflow, ignoreTcsmOverflow,
ignoreRunFailures, ignoreRunFailures,
testReporter, testReporter.get(),
) )
} }