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

[Gradle] Fix test compilation after removing relatedConfigurations

Browse Source 
^KT-58225 Verification Pending
This commit is contained in:
Anton Lakotka
2023-07-05 13:01:54 +02:00
committed by Space Team
parent eb238c0da7
commit 24ff1c6285
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ConfigurationsTest.kt
+16 -3
View File
@@ -17,8 +17,9 @@ import org.gradle.api.attributes.Category
import org.gradle.api.attributes.Usage import org.gradle.api.attributes.Usage
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.*
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
@@ -275,11 +276,23 @@ class ConfigurationsTest : MultiplatformExtensionTest() {
project.evaluate() project.evaluate()
fun HasKotlinDependencies.allDependenciesConfigurationNames() = listOfNotNull(
apiConfigurationName,
implementationConfigurationName,
compileOnlyConfigurationName,
runtimeOnlyConfigurationName
)
fun KotlinCompilation<*>.allCompilationDependenciesConfigurationNames() = allDependenciesConfigurationNames() + listOfNotNull(
compileDependencyConfigurationName,
runtimeDependencyConfigurationName,
)
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
project.kotlinExtension.targets.flatMap { it.compilations }.forEach { compilation -> project.kotlinExtension.targets.flatMap { it.compilations }.forEach { compilation ->
val compilationSourceSets = compilation.allKotlinSourceSets val compilationSourceSets = compilation.allKotlinSourceSets
val compilationConfigurationNames = compilation.relatedConfigurationNames val compilationConfigurationNames = compilation.allCompilationDependenciesConfigurationNames()
val sourceSetConfigurationNames = compilationSourceSets.flatMapTo(mutableSetOf()) { it.relatedConfigurationNames } val sourceSetConfigurationNames = compilationSourceSets.flatMapTo(mutableSetOf()) { it.allDependenciesConfigurationNames() }
assert(compilationConfigurationNames.none { it in sourceSetConfigurationNames }) { assert(compilationConfigurationNames.none { it in sourceSetConfigurationNames }) {
"""A name clash between source set and compilation configurations detected for the following configurations: """A name clash between source set and compilation configurations detected for the following configurations: