From 6ee4cbb6ec8e26274086000f8309f054f2fe8b0e Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Mon, 16 Oct 2023 13:13:45 +0200 Subject: [PATCH] [Gradle, Test] Let resolveAllConfiguration depend on commonizeNativeDistribution after introducing changes as part of KT-61359 ^KT-61359 Verification Pending --- .../kotlin/gradle/util/testResolveAllConfigurations.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 59f064129b3..979f8ad629d 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 @@ -72,7 +72,10 @@ fun TestProject.testResolveAllConfigurations( private fun generateResolveAllConfigurationsTask(excludes: List) = """ - task $RESOLVE_ALL_CONFIGURATIONS_TASK_NAME { + tasks.register("$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") { + if ("commonizeNativeDistribution" in rootProject.tasks.names) { + dependsOn(":commonizeNativeDistribution") + } doFirst { def excludeConfigs = ["default", "archives"] ${computeExcludeConfigurations(excludes)} @@ -100,7 +103,10 @@ private fun generateResolveAllConfigurationsTask(excludes: List) = private fun generateResolveAllConfigurationsTaskKts(excludes: List) = """ - tasks.create("$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") { + tasks.register("$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") { + if ("commonizeNativeDistribution" in rootProject.tasks.names) { + dependsOn(":commonizeNativeDistribution") + } doFirst { val excludeConfigs = mutableListOf("default", "archives") ${computeExcludeConfigurations(excludes)}