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

[Gradle] Fix warnings in kotlinTestDependencyManagement.kt

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-08 21:54:18 +01:00
committed by Space Team
parent 0ec9f2a8b9
commit 85f7dd1c20
1 changed files with 5 additions and 6 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/internal/kotlinTestDependencyManagement.kt
+5 -6
View File
@@ -5,8 +5,6 @@
package org.jetbrains.kotlin.gradle.internal package org.jetbrains.kotlin.gradle.internal
import com.android.build.gradle.api.TestVariant
import com.android.build.gradle.api.UnitTestVariant
import org.gradle.api.NamedDomainObjectSet import org.gradle.api.NamedDomainObjectSet
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.Task import org.gradle.api.Task
@@ -33,8 +31,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.SemVer
import org.jetbrains.kotlin.gradle.targets.jvm.JvmCompilationsTestRunSource import org.jetbrains.kotlin.gradle.targets.jvm.JvmCompilationsTestRunSource
import org.jetbrains.kotlin.gradle.tasks.locateTask import org.jetbrains.kotlin.gradle.tasks.locateTask
import org.jetbrains.kotlin.gradle.testing.KotlinTaskTestRun import org.jetbrains.kotlin.gradle.testing.KotlinTaskTestRun
import org.jetbrains.kotlin.gradle.utils.forAllTargets import org.jetbrains.kotlin.gradle.utils.*
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
private val Dependency.isKotlinTestRootDependency: Boolean private val Dependency.isKotlinTestRootDependency: Boolean
get() = group == KOTLIN_MODULE_GROUP && name == KOTLIN_TEST_ROOT_MODULE_NAME get() = group == KOTLIN_MODULE_GROUP && name == KOTLIN_TEST_ROOT_MODULE_NAME
@@ -133,6 +130,8 @@ private fun KotlinCompilation<*>.kotlinTestCapabilityForJvmSourceSet(
tasks: TaskContainer, tasks: TaskContainer,
): Provider<String>? { ): Provider<String>? {
val compilationTarget = target val compilationTarget = target
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
val testTaskList: List<TaskProvider<out Task>> = when { val testTaskList: List<TaskProvider<out Task>> = when {
compilationTarget is KotlinTargetWithTests<*, *> -> compilationTarget compilationTarget is KotlinTargetWithTests<*, *> -> compilationTarget
.findTestRunsByCompilation(this) .findTestRunsByCompilation(this)
@@ -144,8 +143,8 @@ private fun KotlinCompilation<*>.kotlinTestCapabilityForJvmSourceSet(
listOfNotNull(tasks.locateTask(compilationTarget.testTaskName)) listOfNotNull(tasks.locateTask(compilationTarget.testTaskName))
this is KotlinJvmAndroidCompilation -> when (androidVariant) { this is KotlinJvmAndroidCompilation -> when (androidVariant) {
is UnitTestVariant -> listOfNotNull(tasks.locateTask(lowerCamelCaseName("test", androidVariant.name))) is DeprecatedAndroidUnitTestVariant -> listOfNotNull(tasks.locateTask(lowerCamelCaseName("test", androidVariant.name)))
is TestVariant -> listOfNotNull((androidVariant as TestVariant).connectedInstrumentTestProvider) is DeprecatedAndroidTestVariant -> listOfNotNull(androidVariant.connectedInstrumentTestProvider)
else -> emptyList() else -> emptyList()
} }