From 26d03295cf67f5d3cea020d50f60efa9c597200a Mon Sep 17 00:00:00 2001 From: Yaroslav Chernyshev Date: Thu, 1 Oct 2020 17:20:26 +0300 Subject: [PATCH] [Cocoapods] Remove hierarchical PodInstall dependsOn to `Podspec`s #KT-41844 Fixed --- .../targets/native/cocoapods/KotlinCocoapodsPlugin.kt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt index f3fb460f02f..31b70f1e6a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt @@ -351,20 +351,14 @@ open class KotlinCocoapodsPlugin : Plugin { project: Project, cocoapodsExtension: CocoapodsExtension ) { + val podspecTaskProvider = project.tasks.named(POD_SPEC_TASK_NAME, PodspecTask::class.java) project.tasks.register(POD_INSTALL_TASK_NAME, PodInstallTask::class.java) { it.group = TASK_GROUP it.description = "Invokes `pod install` call within Podfile location directory" it.podfile.set(cocoapodsExtension.podfile) it.frameworkName = project.provider { cocoapodsExtension.frameworkName } it.onlyIf { isAvailableToProduceSynthetic } - - //TODO avoid subproject task management here - project.allprojects.map { it.tasks.named(POD_SPEC_TASK_NAME, PodspecTask::class.java) } - .forEach { podspecTaskProvider -> - podspecTaskProvider.get().takeIf { task -> task.needPodspec.get() } - ?.also { task -> it.inputs.file(task.outputFileProvider) } - it.dependsOn(podspecTaskProvider) - } + it.dependsOn(podspecTaskProvider) } }