[Gradle, Native] Added subspecs support in CocoaPods plugin

#KT-32750 fixed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CocoaPodsIT.kt

@@ -58,6 +58,7 @@ class CocoaPodsIT : BaseGradleIT() {
                     spec.module_name              = "#{spec.name}_umbrella"
 
                     spec.dependency 'pod_dependency', '1.0'
+                    spec.dependency 'subspec_dependency/Core', '1.0'
 
                     spec.pod_target_xcconfig = {
                         'KOTLIN_TARGET[sdk=iphonesimulator*]' => 'ios_x64',
@@ -102,15 +103,16 @@ class CocoaPodsIT : BaseGradleIT() {
             // Check that a project with CocoaPods interop fails to be built from command line.
             build(":kotlin-library:build") {
                 assertFailed()
-                assertContains("Cannot perform cinterop processing for pod_dependency: cannot determine headers location.")
+                assertContains("Cannot perform cinterop processing for module pod_dependency: cannot determine headers location.")
             }
 
             // Check that a project without CocoaPods interop can be built from command line.
             gradleBuildScript("kotlin-library").modify {
-                it.replace("""pod("pod_dependency", "1.0")""", "")
+                it.replace("""pod("pod_dependency", "1.0")""", "").replace("""pod("subspec_dependency/Core", "1.0")""", "")
             }
             projectDir.resolve("kotlin-library/src/iosMain/kotlin/A.kt").modify {
                 it.replace("import cocoapods.pod_dependency.*", "").replace("println(foo())", "")
+                    .replace("import cocoapods.subspec_dependency.*", "").replace("println(baz())", "")
             }
             build(":kotlin-library:linkReleaseFrameworkIOS") {
                 assertSuccessful()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/ios-app/Podfile

@@ -4,5 +4,6 @@ platform :ios, '9.0'
 
 target 'ios-app' do
     pod 'pod_dependency', :path => '../pod_dependency'
+    pod 'subspec_dependency', :path => '../subspec_dependency'
     pod 'kotlin_library', :path => '../kotlin-library'
 end

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/ios-app/ios-app/ViewController.swift

@@ -5,6 +5,7 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         AKt.bar()
+        AKt.bazz()
         // Do any additional setup after loading the view.
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/kotlin-library/build.gradle.kts

@@ -22,5 +22,6 @@ kotlin {
         summary = "CocoaPods test library"
         homepage = "https://github.com/JetBrains/kotlin"
         pod("pod_dependency", "1.0")
+        pod("subspec_dependency/Core", "1.0")
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/kotlin-library/src/iosMain/kotlin/A.kt

@@ -1,5 +1,10 @@
 import cocoapods.pod_dependency.*
+import cocoapods.subspec_dependency.*
 
 fun bar() {
     println(foo())
 }
+
+fun bazz() {
+    println(baz())
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/subspec_dependency/src/baz.h

@@ -0,0 +1,3 @@
+#import <Foundation/Foundation.h>
+
+NSString* baz(void);

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/subspec_dependency/src/baz.m

@@ -0,0 +1,5 @@
+#include "baz.h"
+
+NSString* baz() {
+    return @"Baz";
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods/subspec_dependency/subspec_dependency.podspec

@@ -0,0 +1,15 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'subspec_dependency'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'baz'
+    spec.source                   = { :git => "Not Published", :tag => "Cocoapods/#{spec.name}/#{spec.version}" }
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'baz'
+    spec.default_subspec          = 'Core'
+
+    spec.subspec 'Core' do |core|
+        core.source_files = "src/*"
+        core.public_header_files = "src/*.h"
+    end
+end

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt

@@ -66,7 +66,7 @@ open class CocoapodsExtension(private val project: Project) {
      * Add a CocoaPods dependency to the pod built from this project.
      */
     @JvmOverloads
-    fun pod(name: String, version: String? = null, moduleName: String = name) {
+    fun pod(name: String, version: String? = null, moduleName: String = name.split("/")[0]) {
         check(_pods.findByName(name) == null) { "Project already has a CocoaPods dependency with name $name" }
         _pods.add(CocoapodsDependency(name, version, moduleName))
     }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt

@@ -42,7 +42,7 @@ internal class CocoapodsBuildDirs(val project: Project) {
 
 internal fun String.asValidFrameworkName() = replace('-', '_')
 
-open class KotlinCocoapodsPlugin: Plugin<Project> {
+open class KotlinCocoapodsPlugin : Plugin<Project> {
 
     private fun KotlinMultiplatformExtension.supportedTargets() = targets
         .withType(KotlinNativeTarget::class.java)
@@ -175,19 +175,25 @@ open class KotlinCocoapodsPlugin: Plugin<Project> {
         kotlinExtension: KotlinMultiplatformExtension,
         cocoapodsExtension: CocoapodsExtension
     ) {
+        val moduleNames = mutableSetOf<String>()
         cocoapodsExtension.pods.all { pod ->
+            if (moduleNames.contains(pod.moduleName)) {
+                return@all
+            }
+            moduleNames.add(pod.moduleName)
+
             val defTask = project.tasks.create(
-                lowerCamelCaseName("generateDef", pod.name).asValidTaskName(),
+                lowerCamelCaseName("generateDef", pod.moduleName).asValidTaskName(),
                 DefFileTask::class.java
             ) {
                 it.pod = pod
-                it.description = "Generates a def file for CocoaPods dependency ${pod.name}"
+                it.description = "Generates a def file for CocoaPods dependencies with module ${pod.moduleName}"
                 // This task is an implementation detail so we don't add it in any group
                 // to avoid showing it in the `tasks` output.
             }
 
             kotlinExtension.supportedTargets().all { target ->
-                target.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME).cinterops.create(pod.name) { interop ->
+                target.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME).cinterops.create(pod.moduleName) { interop ->
 
                     val interopTask = project.tasks.getByPath(interop.interopProcessingTaskName)
                     interopTask.dependsOn(defTask)
@@ -199,7 +205,7 @@ open class KotlinCocoapodsPlugin: Plugin<Project> {
                         // Here and below we need to split such paths taking this into account.
                         interop.compilerOpts.addAll(args.splitQuotedArgs())
                     }
-                    project.findProperty(HEADER_PATHS_PROPERTY)?.toString()?.let { args->
+                    project.findProperty(HEADER_PATHS_PROPERTY)?.toString()?.let { args ->
                         interop.compilerOpts.addAll(args.splitQuotedArgs().map { "-I$it" })
                     }
                     project.findProperty(FRAMEWORK_PATHS_PROPERTY)?.toString()?.let { args ->
@@ -216,7 +222,7 @@ open class KotlinCocoapodsPlugin: Plugin<Project> {
 
                         check(hasCompilerOpts || hasHeaderSearchPath) {
                             """
-                                |Cannot perform cinterop processing for ${pod.name}: cannot determine headers location.
+                                |Cannot perform cinterop processing for module ${pod.moduleName}: cannot determine headers location.
                                 |
                                 |Probably the build is executed from command line.
                                 |Note that a Kotlin/Native module using CocoaPods dependencies can be built only from Xcode.
@@ -225,7 +231,6 @@ open class KotlinCocoapodsPlugin: Plugin<Project> {
                             """.trimMargin()
                         }
                     }
-
                 }
             }
         }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt

@@ -57,7 +57,8 @@ open class PodspecTask : DefaultTask() {
         val syncTask = "${project.path}:$SYNC_TASK_NAME"
 
 
-        outputFile.writeText("""
+        outputFile.writeText(
+            """
             |Pod::Spec.new do |spec|
             |    spec.name                     = '$specName'
             |    spec.version                  = '${settings.version}'
@@ -102,7 +103,8 @@ open class PodspecTask : DefaultTask() {
             |        }
             |    ]
             |end
-        """.trimMargin())
+        """.trimMargin()
+        )
 
         logger.quiet(
             """
@@ -204,14 +206,16 @@ open class DefFileTask : DefaultTask() {
 
     @get:OutputFile
     val outputFile: File
-        get() = project.cocoapodsBuildDirs.defs.resolve("${pod.name}.def")
+        get() = project.cocoapodsBuildDirs.defs.resolve("${pod.moduleName}.def")
 
     @TaskAction
     fun generate() {
         outputFile.parentFile.mkdirs()
-        outputFile.writeText("""
+        outputFile.writeText(
+            """
             language = Objective-C
             modules = ${pod.moduleName}
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 }