diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt index 2f53d6c0751..dbb53a16ad6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt @@ -43,6 +43,7 @@ class XCFrameworkIT : BaseGradleIT() { assertTasksExecuted(":shared:assembleSdkDebugWatchosFatFrameworkForXCFramework") assertTasksExecuted(":shared:assembleSdkDebugXCFramework") assertFileExists("/shared/build/XCFrameworks/debug/sdk.xcframework") + assertFileExists("/shared/build/XCFrameworks/debug/sdk.xcframework/ios-arm64/dSYMs/sdk.framework.dSYM") assertFileExists("/shared/build/fat-framework/debug/sdk/watchos/sdk.framework") assertFileExists("/shared/build/fat-framework/debug/sdk/watchos/sdk.framework.dSYM") } @@ -69,10 +70,12 @@ class XCFrameworkIT : BaseGradleIT() { assertTasksExecuted(":shared:linkReleaseFrameworkIosX64") assertTasksExecuted(":shared:assembleReleaseXCFramework") assertFileExists("/shared/build/XCFrameworks/release/shared.xcframework") + assertFileExists("/shared/build/XCFrameworks/release/shared.xcframework/ios-arm64/dSYMs/shared.framework.dSYM") assertTasksExecuted(":shared:linkDebugFrameworkIosArm64") assertTasksExecuted(":shared:linkDebugFrameworkIosX64") assertTasksExecuted(":shared:assembleDebugXCFramework") assertFileExists("/shared/build/XCFrameworks/debug/shared.xcframework") + assertFileExists("/shared/build/XCFrameworks/debug/shared.xcframework/ios-arm64/dSYMs/shared.framework.dSYM") } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt index efdd1566311..845dcb88832 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt @@ -231,9 +231,12 @@ abstract class XCFrameworkTask : DefaultTask() { frameworkFiles.forEach { frameworkFile -> cmdArgs.add("-framework") cmdArgs.add(frameworkFile.file.path) - if (buildType == NativeBuildType.DEBUG && frameworkFile.isStatic.not()) { - cmdArgs.add("-debug-symbols") - cmdArgs.add(frameworkFile.file.path + ".dSYM") + if (!frameworkFile.isStatic) { + val dsymFile = File(frameworkFile.file.path + ".dSYM") + if (dsymFile.exists()) { + cmdArgs.add("-debug-symbols") + cmdArgs.add(dsymFile.path) + } } } cmdArgs.add("-output")