commit | 2a7715af22f797a7b6088a4ed5032fbb8129345b | [log] [tgz] |
---|---|---|
author | Anton Lakotka <anton.lakotka@jetbrains.com> | Tue Nov 07 08:39:38 2023 +0100 |
committer | Anton Lakotka <anton.lakotka@jetbrains.com> | Sun Nov 12 19:17:54 2023 +0100 |
tree | 2aad18d6c2aa3bb4ba2e0849137abbd6cfbfd7fd | |
parent | 60e07639f1ff6f2d7834f34c4f70bceb6817f0ec [diff] |
[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
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 77ea71c..6e5174c 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 @@ } }) - 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 {