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

[Gradle] Fix testResolveAllConfigurations

Browse Source 
It should exclude certain kotlin source set configurations, that
can't be resolved all the time for various reasons.

Particularly `dependencySources` since not all dependencies has
published source variants.
This commit is contained in:
Anton Lakotka
2023-12-04 21:50:19 +01:00
committed by Space Team
parent c979e4e7be
commit daa97f7ec9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt
+6 -6
View File
@@ -84,8 +84,8 @@ private fun generateResolveAllConfigurationsTask(excludes: List<String>) =
.matching { it.canBeResolved } .matching { it.canBeResolved }
.matching { !excludeConfigs.contains(it.name) } .matching { !excludeConfigs.contains(it.name) }
.each { configuration -> .each { configuration ->
try { def configurationPath = (project.path == ":") ? ":" + configuration.name : project.path + ":" + configuration.name
def configurationPath = (project.path == ":") ? ":" + configuration.name : project.path + ":" + configuration.name try {
println "Resolving " + configurationPath println "Resolving " + configurationPath
configuration.files.each { println '>> ' + configurationPath + ' --> ' + it.name } configuration.files.each { println '>> ' + configurationPath + ' --> ' + it.name }
println "OK, resolved " + configurationPath + "\n" println "OK, resolved " + configurationPath + "\n"
@@ -136,15 +136,15 @@ private fun generateResolveAllConfigurationsTaskKts(excludes: List<String>) =
} }
""".trimIndent() """.trimIndent()
private fun computeExcludeConfigurations(excludes: List<String>): String { private fun computeExcludeConfigurations(excludes: List<String>): String {
val deprecatedConfigurations = listOf("compile", "runtime", "compileOnly", "runtimeOnly") val excludingConfigurations = listOf("compile", "runtime", "compileOnly", "runtimeOnly", "dependencySources")
return """ return """
sourceSets.forEach { sourceSet -> kotlin.sourceSets.forEach { sourceSet ->
"${deprecatedConfigurations.joinToString()}".split(", ").toList().forEach { "${excludingConfigurations.joinToString()}".split(", ").toList().forEach {
excludeConfigs.add(sourceSet.name + it.capitalize()) excludeConfigs.add(sourceSet.name + it.capitalize())
} }
} }
"${deprecatedConfigurations.joinToString()}".split(", ").toList().forEach { "${excludingConfigurations.joinToString()}".split(", ").toList().forEach {
excludeConfigs.add(it) excludeConfigs.add(it)
excludeConfigs.add("test" + it.capitalize()) excludeConfigs.add("test" + it.capitalize())
} }