From daa97f7ec99956f0ac385f7559dfdd99662dafba Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Mon, 4 Dec 2023 21:50:19 +0100 Subject: [PATCH] [Gradle] Fix testResolveAllConfigurations 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. --- .../gradle/util/testResolveAllConfigurations.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt index 5b468a383c2..99268457dd9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt @@ -84,8 +84,8 @@ private fun generateResolveAllConfigurationsTask(excludes: List) = .matching { it.canBeResolved } .matching { !excludeConfigs.contains(it.name) } .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 configuration.files.each { println '>> ' + configurationPath + ' --> ' + it.name } println "OK, resolved " + configurationPath + "\n" @@ -136,15 +136,15 @@ private fun generateResolveAllConfigurationsTaskKts(excludes: List) = } """.trimIndent() private fun computeExcludeConfigurations(excludes: List): String { - val deprecatedConfigurations = listOf("compile", "runtime", "compileOnly", "runtimeOnly") + val excludingConfigurations = listOf("compile", "runtime", "compileOnly", "runtimeOnly", "dependencySources") return """ - sourceSets.forEach { sourceSet -> - "${deprecatedConfigurations.joinToString()}".split(", ").toList().forEach { + kotlin.sourceSets.forEach { sourceSet -> + "${excludingConfigurations.joinToString()}".split(", ").toList().forEach { excludeConfigs.add(sourceSet.name + it.capitalize()) } } - "${deprecatedConfigurations.joinToString()}".split(", ").toList().forEach { + "${excludingConfigurations.joinToString()}".split(", ").toList().forEach { excludeConfigs.add(it) excludeConfigs.add("test" + it.capitalize()) }