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

[Cocoapods] Remove hierarchical PodInstall dependsOn to Podspecs

Browse Source 
#KT-41844 Fixed
This commit is contained in:
Yaroslav Chernyshev
2020-10-01 17:20:26 +03:00
parent e49f881e7f
commit 26d03295cf
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt
+2 -8
View File
@@ -351,20 +351,14 @@ open class KotlinCocoapodsPlugin : Plugin<Project> {
project: Project, project: Project,
cocoapodsExtension: CocoapodsExtension cocoapodsExtension: CocoapodsExtension
) { ) {
val podspecTaskProvider = project.tasks.named(POD_SPEC_TASK_NAME, PodspecTask::class.java)
project.tasks.register(POD_INSTALL_TASK_NAME, PodInstallTask::class.java) { project.tasks.register(POD_INSTALL_TASK_NAME, PodInstallTask::class.java) {
it.group = TASK_GROUP it.group = TASK_GROUP
it.description = "Invokes `pod install` call within Podfile location directory" it.description = "Invokes `pod install` call within Podfile location directory"
it.podfile.set(cocoapodsExtension.podfile) it.podfile.set(cocoapodsExtension.podfile)
it.frameworkName = project.provider { cocoapodsExtension.frameworkName } it.frameworkName = project.provider { cocoapodsExtension.frameworkName }
it.onlyIf { isAvailableToProduceSynthetic } it.onlyIf { isAvailableToProduceSynthetic }
it.dependsOn(podspecTaskProvider)
//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)
}
} }
} }