diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index 3eb482e05a5..e2b71189bc0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -871,13 +871,26 @@ class CocoaPodsIT : BaseGradleIT() { } @Test - fun testSyncFrameworkMultipleArchitectures() { + fun testSyncFrameworkMultipleArchitecturesWithCustomName() { with(project) { - gradleBuildScript().appendToKotlinBlock("iosArm64()") - gradleBuildScript().appendToKotlinBlock("iosArm32()") + val frameworkName = "customSdk" + gradleBuildScript().appendText( + """ + | + |kotlin { + | iosArm64() + | iosArm32() + | cocoapods { + | framework { + | baseName = "$frameworkName" + | } + | } + |} + """.trimMargin() + ) hooks.addHook { // Check that an output framework is a dynamic framework - val framework = fileInWorkingDir("build/cocoapods/framework/cocoapods.framework/cocoapods") + val framework = fileInWorkingDir("build/cocoapods/framework/$frameworkName.framework/$frameworkName") with(runProcess(listOf("file", framework.absolutePath), projectDir)) { assertTrue(isSuccessful) assertTrue(output.contains("\\(for architecture armv7\\):\\s+current ar archive".toRegex())) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt index 5d84aaa967d..29a997da4b1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt @@ -200,7 +200,9 @@ open class KotlinCocoapodsPlugin : Plugin { fatTargets.forEach { (_, targets) -> targets.singleOrNull()?.let { - task.from(it.binaries.getFramework(POD_FRAMEWORK_PREFIX, requestedBuildType)) + val framework = it.binaries.getFramework(POD_FRAMEWORK_PREFIX, requestedBuildType) + task.baseName = framework.baseName //all frameworks should have same names + task.from(framework) } } }