diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f6c1d17f..a5695878d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ Changelog ### Bug fixes + +* Fix a packaging issue when using Carthage, introduced in 5.22.7. **Note:** + There is a remaining known issue when updating/building the bugsnag-cocoa + dependency with Carthage, the project will build three times before completing + successfully. This issue will be resolved in a subsequent patch release. + [#423](https://github.com/bugsnag/bugsnag-cocoa/pull/423) * Fix use-after-free in `notify()` logic which could lead to a deadlock [#420](https://github.com/bugsnag/bugsnag-cocoa/pull/420) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4afafd42f..fd5929ff9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,6 +92,7 @@ Run the integration tests using `make e2e` (end-to-end) - [ ] Run `./Tests/prerelease/run_prerelease_checks.sh` - [ ] Has all new functionality been manually tested on a release build? - [ ] Do the installation instructions work when creating an example app from scratch? + - [ ] Does the Carthage installation instruction work? - [ ] If a response is not received from the server, is the report queued for later? - [ ] If no network connection is available, is the report queued for later? - [ ] On a throttled network, is the request timeout reasonable, and the main thread not blocked? diff --git a/Configurations/Config.xcconfig b/Configurations/Config.xcconfig index 66c371f2c..4508dc301 100644 --- a/Configurations/Config.xcconfig +++ b/Configurations/Config.xcconfig @@ -41,6 +41,13 @@ LD_RUNPATH_SEARCH_PATHS[sdk=watchsimulator*] = $(inherited) '@executable_path/ LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +// Platform-specific dependencies +OTHER_LDFLAGS[sdk=macosx*] = $(inherited) '-framework' 'Cocoa' +OTHER_LDFLAGS[sdk=iphoneos*] = $(inherited) '-framework' 'UIKit' +OTHER_LDFLAGS[sdk=iphonesimulator*] = $(inherited) '-framework' 'UIKit' +OTHER_LDFLAGS[sdk=appletvos*] = $(inherited) '-framework' 'UIKit' +OTHER_LDFLAGS[sdk=appletvsimulator*] = $(inherited) '-framework' 'UIKit' + // OSX-specific default settings FRAMEWORK_VERSION[sdk=macosx*] = A COMBINE_HIDPI_IMAGES[sdk=macosx*] = YES diff --git a/OSX/Bugsnag.xcodeproj/project.pbxproj b/OSX/Bugsnag.xcodeproj/project.pbxproj index 1fa777890..efabe84a3 100644 --- a/OSX/Bugsnag.xcodeproj/project.pbxproj +++ b/OSX/Bugsnag.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ 8A2C8FEC1C6BC38900846019 /* BugsnagSinkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2C8FE21C6BC38200846019 /* BugsnagSinkTests.m */; }; 8A2C8FEE1C6BC38900846019 /* report.json in Resources */ = {isa = PBXBuildFile; fileRef = 8A2C8FE41C6BC38200846019 /* report.json */; }; 8A2C8FF01C6BC3A200846019 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A2C8FEF1C6BC3A200846019 /* SystemConfiguration.framework */; }; - 8A2C90441C6C040700846019 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A2C90401C6C03F000846019 /* Cocoa.framework */; }; 8A48EF271EAA805D00B70024 /* BugsnagLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A48EF261EAA805D00B70024 /* BugsnagLogger.h */; }; 8A530CB822FDC38300F0C108 /* BSG_KSCrashIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A530CB622FDC38300F0C108 /* BSG_KSCrashIdentifier.h */; }; 8A530CB922FDC38300F0C108 /* BSG_KSCrashIdentifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A530CB722FDC38300F0C108 /* BSG_KSCrashIdentifier.m */; }; @@ -368,7 +367,6 @@ files = ( E7433AD31F4F64F400C082D1 /* libc++.tbd in Frameworks */, E7433AD21F4F64EF00C082D1 /* libz.tbd in Frameworks */, - 8A2C90441C6C040700846019 /* Cocoa.framework in Frameworks */, 8A2C8FF01C6BC3A200846019 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/iOS/Bugsnag.xcodeproj/project.pbxproj b/iOS/Bugsnag.xcodeproj/project.pbxproj index bfc6520e3..2e4809f43 100644 --- a/iOS/Bugsnag.xcodeproj/project.pbxproj +++ b/iOS/Bugsnag.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ 8A2C8F5F1C6BBE3C00846019 /* BugsnagSink.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A2C8F4D1C6BBE3C00846019 /* BugsnagSink.h */; }; 8A2C8F601C6BBE3C00846019 /* BugsnagSink.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2C8F4E1C6BBE3C00846019 /* BugsnagSink.m */; }; 8A2C8F6C1C6BBE9500846019 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A2C8F6B1C6BBE9500846019 /* SystemConfiguration.framework */; }; - 8A2C8F741C6BBEAD00846019 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A2C8F731C6BBEAD00846019 /* UIKit.framework */; }; 8A2C8F8F1C6BBFDD00846019 /* BugsnagBreadcrumbsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2C8F8B1C6BBFDD00846019 /* BugsnagBreadcrumbsTest.m */; }; 8A2C8F901C6BBFDD00846019 /* BugsnagCrashReportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2C8F8C1C6BBFDD00846019 /* BugsnagCrashReportTests.m */; }; 8A2C8F911C6BBFDD00846019 /* BugsnagSinkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2C8F8D1C6BBFDD00846019 /* BugsnagSinkTests.m */; }; @@ -593,7 +592,6 @@ E7433AD11F4F64D900C082D1 /* libz.tbd in Frameworks */, E7433AD01F4F64D400C082D1 /* libc++.tbd in Frameworks */, E7EC041A1F4CC97200C2E9D5 /* Foundation.framework in Frameworks */, - 8A2C8F741C6BBEAD00846019 /* UIKit.framework in Frameworks */, 8A2C8F6C1C6BBE9500846019 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0;