Skip to content

Commit

Permalink
build: Include platform-specific framework linking in xcconfig file
Browse files Browse the repository at this point in the history
Fixes an issue where cocoa.framework is being requested from iOS builds
  • Loading branch information
kattrali committed Oct 10, 2019
1 parent 4447b34 commit 4441fea
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
7 changes: 7 additions & 0 deletions Configurations/Config.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions OSX/Bugsnag.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions iOS/Bugsnag.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4441fea

Please sign in to comment.