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

Add dSYMs to release XCFramework.

Browse Source 
#KT-49484
This commit is contained in:
konstantin.tskhovrebov
2021-11-02 20:20:20 +01:00
committed by Space
parent 8ff1d66ec9
commit d9f5ef2f91
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt
+3
View File
@@ -43,6 +43,7 @@ class XCFrameworkIT : BaseGradleIT() {
assertTasksExecuted(":shared:assembleSdkDebugWatchosFatFrameworkForXCFramework") assertTasksExecuted(":shared:assembleSdkDebugWatchosFatFrameworkForXCFramework")
assertTasksExecuted(":shared:assembleSdkDebugXCFramework") assertTasksExecuted(":shared:assembleSdkDebugXCFramework")
assertFileExists("/shared/build/XCFrameworks/debug/sdk.xcframework") 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")
assertFileExists("/shared/build/fat-framework/debug/sdk/watchos/sdk.framework.dSYM") assertFileExists("/shared/build/fat-framework/debug/sdk/watchos/sdk.framework.dSYM")
} }
@@ -69,10 +70,12 @@ class XCFrameworkIT : BaseGradleIT() {
assertTasksExecuted(":shared:linkReleaseFrameworkIosX64") assertTasksExecuted(":shared:linkReleaseFrameworkIosX64")
assertTasksExecuted(":shared:assembleReleaseXCFramework") assertTasksExecuted(":shared:assembleReleaseXCFramework")
assertFileExists("/shared/build/XCFrameworks/release/shared.xcframework") 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:linkDebugFrameworkIosArm64")
assertTasksExecuted(":shared:linkDebugFrameworkIosX64") assertTasksExecuted(":shared:linkDebugFrameworkIosX64")
assertTasksExecuted(":shared:assembleDebugXCFramework") assertTasksExecuted(":shared:assembleDebugXCFramework")
assertFileExists("/shared/build/XCFrameworks/debug/shared.xcframework") assertFileExists("/shared/build/XCFrameworks/debug/shared.xcframework")
assertFileExists("/shared/build/XCFrameworks/debug/shared.xcframework/ios-arm64/dSYMs/shared.framework.dSYM")
} }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt
+6 -3
View File
@@ -231,9 +231,12 @@ abstract class XCFrameworkTask : DefaultTask() {
frameworkFiles.forEach { frameworkFile -> frameworkFiles.forEach { frameworkFile ->
cmdArgs.add("-framework") cmdArgs.add("-framework")
cmdArgs.add(frameworkFile.file.path) cmdArgs.add(frameworkFile.file.path)
if (buildType == NativeBuildType.DEBUG && frameworkFile.isStatic.not()) { if (!frameworkFile.isStatic) {
cmdArgs.add("-debug-symbols") val dsymFile = File(frameworkFile.file.path + ".dSYM")
cmdArgs.add(frameworkFile.file.path + ".dSYM") if (dsymFile.exists()) {
cmdArgs.add("-debug-symbols")
cmdArgs.add(dsymFile.path)
}
} }
} }
cmdArgs.add("-output") cmdArgs.add("-output")