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

[Gradle, Test] Let resolveAllConfiguration depend on commonizeNativeDistribution

Browse Source 
after introducing changes as part of KT-61359

^KT-61359 Verification Pending
This commit is contained in:
Anton Lakotka
2023-10-16 13:13:45 +02:00
committed by Space Team
parent c08fb1cae6
commit 6ee4cbb6ec
1 changed files with 8 additions and 2 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
+8 -2
View File
@@ -72,7 +72,10 @@ fun TestProject.testResolveAllConfigurations(
private fun generateResolveAllConfigurationsTask(excludes: List<String>) = private fun generateResolveAllConfigurationsTask(excludes: List<String>) =
""" """
task $RESOLVE_ALL_CONFIGURATIONS_TASK_NAME { tasks.register("$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") {
if ("commonizeNativeDistribution" in rootProject.tasks.names) {
dependsOn(":commonizeNativeDistribution")
}
doFirst { doFirst {
def excludeConfigs = ["default", "archives"] def excludeConfigs = ["default", "archives"]
${computeExcludeConfigurations(excludes)} ${computeExcludeConfigurations(excludes)}
@@ -100,7 +103,10 @@ private fun generateResolveAllConfigurationsTask(excludes: List<String>) =
private fun generateResolveAllConfigurationsTaskKts(excludes: List<String>) = private fun generateResolveAllConfigurationsTaskKts(excludes: List<String>) =
""" """
tasks.create("$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") { tasks.register("$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") {
if ("commonizeNativeDistribution" in rootProject.tasks.names) {
dependsOn(":commonizeNativeDistribution")
}
doFirst { doFirst {
val excludeConfigs = mutableListOf("default", "archives") val excludeConfigs = mutableListOf("default", "archives")
${computeExcludeConfigurations(excludes)} ${computeExcludeConfigurations(excludes)}