From 5161b3b7d885a8ca1ea3ee2e3c2ed0740c8954f7 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 7 Nov 2023 08:39:38 +0100 Subject: [PATCH] [Gradle] Replace `TaskProvider.flatMap` with `map { it.get() }` flatMap doesn't support implicit task dependencies due to bug: https://github.com/gradle/gradle/issues/25645 However `map { it.get() }` works. ^KT-63011 Verification Pending --- .../kotlin/gradle/targets/native/configureBinaryFrameworks.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt index 77ea71c574e..6e5174c0ad8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt @@ -55,7 +55,9 @@ internal fun Project.createFrameworkArtifact(binaryFramework: Framework, linkTas } }) - addFrameworkArtifact(frameworkConfiguration, linkTask.flatMap { it.outputFile }) + // Can't use flatMap here because of https://github.com/gradle/gradle/issues/25645 + val linkTaskOutputProvider = linkTask.map { it.outputFile.get() } + addFrameworkArtifact(frameworkConfiguration, linkTaskOutputProvider) } internal val CreateFatFrameworksSetupAction = KotlinProjectSetupCoroutine {