diff --git a/.gitignore b/.gitignore index eddd7ee87..9af183d69 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ DerivedData Pods Carthage *.idea +features/fixtures/carthage-proj diff --git a/.travis.yml b/.travis.yml index 0c4472629..e62da3fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,12 @@ cache: - cocoapods matrix: include: + - osx_image: xcode11 + before_script: + # Xcode 11+ no longer ships with all device combinations premade + - xcrun simctl create "13-xs" "iPhone XS" com.apple.CoreSimulator.SimRuntime.iOS-13-0 + - mkdir -p features/fixtures/carthage-proj + script: make build_carthage - osx_image: xcode11 env: PLATFORM=iOS # Xcode 11+ no longer ships with all device combinations premade diff --git a/CHANGELOG.md b/CHANGELOG.md index b442a2925..1643c566c 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) * Reduce severity of log message about thread status from 'error' to 'debug' as 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..ed544f9c2 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 @@ -65,3 +72,9 @@ ENABLE_BITCODE[sdk=iphonesimulator*] = YES ENABLE_BITCODE[sdk=iphone*] = YES ENABLE_BITCODE[sdk=appletvsimulator*] = YES ENABLE_BITCODE[sdk=appletv*] = YES + + +// Unset this property to work around an issue where the build paths generated +// by `xcodebuild -showBuildSettings` are wrong when building the macOS variant +// of a universal framework. (FB7365403) +EFFECTIVE_PLATFORM_NAME = diff --git a/Makefile b/Makefile index ac5f961a9..cbeaff7c2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PLATFORM?=iOS OS?=latest TEST_CONFIGURATION?=Debug -BUILD_FLAGS=-workspace $(PLATFORM).xcworkspace -scheme Bugsnag -derivedDataPath build +BUILD_FLAGS=-project $(PLATFORM)/Bugsnag.xcodeproj -scheme Bugsnag -derivedDataPath build ifeq ($(PLATFORM),OSX) SDK?=macosx @@ -49,6 +49,12 @@ build: ## Build the library build_ios_static: ## Build the static library target $(XCODEBUILD) -project iOS/Bugsnag.xcodeproj -scheme BugsnagStatic +build_carthage: ## Build the latest pushed commit with Carthage + @mkdir -p features/fixtures/carthage-proj + @echo 'git "file://$(shell pwd)" "'$(shell git rev-parse HEAD)'"' > features/fixtures/carthage-proj/Cartfile + @cd features/fixtures/carthage-proj && carthage update --platform ios && \ + carthage update --platform macos + bump: ## Bump the version numbers to $VERSION ifeq ($(VERSION),) @$(error VERSION is not defined. Run with `make VERSION=number bump`) diff --git a/OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint b/OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint deleted file mode 100644 index 02e84b142..000000000 --- a/OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint +++ /dev/null @@ -1,37 +0,0 @@ -{ - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90", - "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { - - }, - "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : 0, - "D2885296440547CB23891301E79B480A22EAC5F6" : 0, - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : 0 - }, - "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "64F71D72-7937-47C7-9FA1-099F1EFA7F49", - "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : "bugsnag-cocoa\/development\/Kiwi\/", - "D2885296440547CB23891301E79B480A22EAC5F6" : "bugsnag-cocoa-r\/Carthage\/Checkouts\/KSCrash\/", - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : "bugsnag-cocoa-r\/" - }, - "DVTSourceControlWorkspaceBlueprintNameKey" : "OSX", - "DVTSourceControlWorkspaceBlueprintVersion" : 204, - "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "OSX.xcworkspace", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kiwi-bdd\/Kiwi", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:bugsnag\/bugsnag-cocoa", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kstenerud\/KSCrash", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D2885296440547CB23891301E79B480A22EAC5F6" - } - ] -} \ No newline at end of file diff --git a/OSX/Bugsnag.xcodeproj/project.pbxproj b/OSX/Bugsnag.xcodeproj/project.pbxproj index 1fa777890..06e161a2e 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 */; }; @@ -44,7 +43,6 @@ 8A87352C1C6D3B1600EDBD5B /* BSG_KSCrashReportWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A87352B1C6D3B1600EDBD5B /* BSG_KSCrashReportWriter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8ACF0F752018136200173809 /* BugsnagCrashReportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2C8FE11C6BC38200846019 /* BugsnagCrashReportTests.m */; }; 8AD9FA891E086351002859A7 /* BugsnagConfigurationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AD9FA851E0862DC002859A7 /* BugsnagConfigurationTests.m */; }; - 8ADEC7952333A038003CF0F5 /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8ADEC7942333A038003CF0F5 /* Config.xcconfig */; }; E72352C11F55924A00436528 /* BSGConnectivity.h in Headers */ = {isa = PBXBuildFile; fileRef = E72352BF1F55924A00436528 /* BSGConnectivity.h */; }; E72352C21F55924A00436528 /* BSGConnectivity.m in Sources */ = {isa = PBXBuildFile; fileRef = E72352C01F55924A00436528 /* BSGConnectivity.m */; }; E7433AD21F4F64EF00C082D1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A2C8FF11C6BC3A800846019 /* libz.tbd */; }; @@ -229,7 +227,6 @@ 8A6C6FB02257884C00E8EF24 /* BSGOutOfMemoryWatchdog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSGOutOfMemoryWatchdog.h; path = ../Source/BSGOutOfMemoryWatchdog.h; sourceTree = ""; }; 8A87352B1C6D3B1600EDBD5B /* BSG_KSCrashReportWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSG_KSCrashReportWriter.h; path = ../Source/BSG_KSCrashReportWriter.h; sourceTree = SOURCE_ROOT; }; 8AD9FA851E0862DC002859A7 /* BugsnagConfigurationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BugsnagConfigurationTests.m; path = ../Tests/BugsnagConfigurationTests.m; sourceTree = SOURCE_ROOT; }; - 8ADEC7942333A038003CF0F5 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = ../Configurations/Config.xcconfig; sourceTree = ""; }; E72352BF1F55924A00436528 /* BSGConnectivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSGConnectivity.h; path = ../Source/BSGConnectivity.h; sourceTree = SOURCE_ROOT; }; E72352C01F55924A00436528 /* BSGConnectivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BSGConnectivity.m; path = ../Source/BSGConnectivity.m; sourceTree = SOURCE_ROOT; }; E762E9F71F73F7E900E82B43 /* BugsnagHandledStateTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BugsnagHandledStateTest.m; path = ../Tests/BugsnagHandledStateTest.m; sourceTree = SOURCE_ROOT; }; @@ -368,7 +365,6 @@ files = ( E7433AD31F4F64F400C082D1 /* libc++.tbd in Frameworks */, E7433AD21F4F64EF00C082D1 /* libz.tbd in Frameworks */, - 8A2C90441C6C040700846019 /* Cocoa.framework in Frameworks */, 8A2C8FF01C6BC3A200846019 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -387,7 +383,6 @@ 8A2C8F971C6BC1F700846019 = { isa = PBXGroup; children = ( - 8ADEC7942333A038003CF0F5 /* Config.xcconfig */, 8A2C8FA31C6BC1F700846019 /* Bugsnag */, 8A2C8FAF1C6BC1F700846019 /* Tests */, 8A2C8FF51C6BC3C200846019 /* Frameworks */, @@ -837,7 +832,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8ADEC7952333A038003CF0F5 /* Config.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -968,7 +962,6 @@ /* Begin XCBuildConfiguration section */ 8A2C8FB31C6BC1F700846019 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8ADEC7942333A038003CF0F5 /* Config.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1025,7 +1018,6 @@ }; 8A2C8FB41C6BC1F700846019 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8ADEC7942333A038003CF0F5 /* Config.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; diff --git a/iOS.xcworkspace/contents.xcworkspacedata b/iOS.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 42deaa1b5..000000000 --- a/iOS.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint b/iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint deleted file mode 100644 index 373a8f36e..000000000 --- a/iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint +++ /dev/null @@ -1,37 +0,0 @@ -{ - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90", - "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { - - }, - "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : 0, - "D2885296440547CB23891301E79B480A22EAC5F6" : 0, - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : 0 - }, - "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "103C8171-87E2-4033-A0B3-0E14C4C49F02", - "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : "bugsnag-cocoa\/development\/Kiwi\/", - "D2885296440547CB23891301E79B480A22EAC5F6" : "bugsnag-cocoa\/Carthage\/Checkouts\/KSCrash\/", - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : "bugsnag-cocoa\/" - }, - "DVTSourceControlWorkspaceBlueprintNameKey" : "iOS", - "DVTSourceControlWorkspaceBlueprintVersion" : 204, - "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "iOS.xcworkspace", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kiwi-bdd\/Kiwi", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:bugsnag\/bugsnag-cocoa", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kstenerud\/KSCrash", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D2885296440547CB23891301E79B480A22EAC5F6" - } - ] -} \ No newline at end of file diff --git a/iOS/Bugsnag.xcodeproj/project.pbxproj b/iOS/Bugsnag.xcodeproj/project.pbxproj index bfc6520e3..a2784ab9d 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 */; }; @@ -44,7 +43,6 @@ 8A70D9CB22539C81006B696F /* BSGOutOfMemoryWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A70D9C822539C81006B696F /* BSGOutOfMemoryWatchdog.m */; }; 8A70D9CD2253C484006B696F /* BSGOutOfMemoryWatchdogTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A70D9CC2253C484006B696F /* BSGOutOfMemoryWatchdogTests.m */; }; 8AF1748E23070F0300902CC2 /* BSG_KSCrashIdentifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A530CBF22FDC3AE00F0C108 /* BSG_KSCrashIdentifier.m */; }; - 8AF2894A23339CCA00E8EB27 /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8AF2894923339CCA00E8EB27 /* Config.xcconfig */; }; E70E52152216E41C00A590AB /* BugsnagSessionTrackerStopTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E70E52142216E41C00A590AB /* BugsnagSessionTrackerStopTest.m */; }; E70EE0781FD7039E00FA745C /* RFC3339DateTool_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E70EE0771FD7039D00FA745C /* RFC3339DateTool_Tests.m */; }; E70EE07E1FD703D600FA745C /* NSError+SimpleConstructor_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E70EE07A1FD703D500FA745C /* NSError+SimpleConstructor_Tests.m */; }; @@ -593,7 +591,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; @@ -1101,7 +1098,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8AF2894A23339CCA00E8EB27 /* Config.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/tvOS.xcworkspace/contents.xcworkspacedata b/tvOS.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d3039102..000000000 --- a/tvOS.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint b/tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint deleted file mode 100644 index a46599904..000000000 --- a/tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint +++ /dev/null @@ -1,30 +0,0 @@ -{ - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90", - "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { - - }, - "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "D2885296440547CB23891301E79B480A22EAC5F6" : 9223372036854775807, - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : 9223372036854775807 - }, - "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "CD7F443B-EF8B-403E-B13A-B0D711C0B807", - "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "D2885296440547CB23891301E79B480A22EAC5F6" : "bugsnag-cocoa\/Carthage\/Checkouts\/KSCrash\/", - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : "bugsnag-cocoa\/" - }, - "DVTSourceControlWorkspaceBlueprintNameKey" : "tvOS", - "DVTSourceControlWorkspaceBlueprintVersion" : 204, - "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "tvOS.xcworkspace", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:bugsnag\/bugsnag-cocoa.git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kstenerud\/KSCrash.git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D2885296440547CB23891301E79B480A22EAC5F6" - } - ] -} \ No newline at end of file diff --git a/tvOS/Bugsnag.xcodeproj/project.pbxproj b/tvOS/Bugsnag.xcodeproj/project.pbxproj index 7fbee2dbe..3f1d9943c 100644 --- a/tvOS/Bugsnag.xcodeproj/project.pbxproj +++ b/tvOS/Bugsnag.xcodeproj/project.pbxproj @@ -47,7 +47,6 @@ 8AD9A5041D42EEB0004E1CC5 /* BugsnagSink.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AB151351D41366400C9B218 /* BugsnagSink.m */; }; 8AD9A5051D42EEE9004E1CC5 /* BSG_KSCrashReportWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB151251D41366400C9B218 /* BSG_KSCrashReportWriter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8AD9FA8D1E0863A1002859A7 /* BugsnagConfigurationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AD9FA8B1E0863A1002859A7 /* BugsnagConfigurationTests.m */; }; - 8ADEC7932333A00B003CF0F5 /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8ADEC7922333A00B003CF0F5 /* Config.xcconfig */; }; E72352BA1F55922F00436528 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E72352B91F55922F00436528 /* SystemConfiguration.framework */; }; E72352BD1F55923700436528 /* BSGConnectivity.h in Headers */ = {isa = PBXBuildFile; fileRef = E72352BB1F55923700436528 /* BSGConnectivity.h */; }; E72352BE1F55923700436528 /* BSGConnectivity.m in Sources */ = {isa = PBXBuildFile; fileRef = E72352BC1F55923700436528 /* BSGConnectivity.m */; }; @@ -232,7 +231,6 @@ 8AB151341D41366400C9B218 /* BugsnagSink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BugsnagSink.h; path = ../Source/BugsnagSink.h; sourceTree = ""; }; 8AB151351D41366400C9B218 /* BugsnagSink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BugsnagSink.m; path = ../Source/BugsnagSink.m; sourceTree = ""; }; 8AD9FA8B1E0863A1002859A7 /* BugsnagConfigurationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BugsnagConfigurationTests.m; path = ../Tests/BugsnagConfigurationTests.m; sourceTree = SOURCE_ROOT; }; - 8ADEC7922333A00B003CF0F5 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = ../Configurations/Config.xcconfig; sourceTree = ""; }; E72352B91F55922F00436528 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; E72352BB1F55923700436528 /* BSGConnectivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSGConnectivity.h; path = ../Source/BSGConnectivity.h; sourceTree = ""; }; E72352BC1F55923700436528 /* BSGConnectivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BSGConnectivity.m; path = ../Source/BSGConnectivity.m; sourceTree = ""; }; @@ -392,7 +390,6 @@ 8A8D511A1D41343500D33797 = { isa = PBXGroup; children = ( - 8ADEC7922333A00B003CF0F5 /* Config.xcconfig */, 8A8D51261D41343500D33797 /* tvOS */, 8AB151131D41356800C9B218 /* Tests */, 8A8D51251D41343500D33797 /* Products */, @@ -849,7 +846,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8ADEC7932333A00B003CF0F5 /* Config.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1093,7 +1089,6 @@ }; 8A8D512D1D41343500D33797 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8ADEC7922333A00B003CF0F5 /* Config.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; DEFINES_MODULE = YES; @@ -1112,7 +1107,6 @@ }; 8A8D512E1D41343500D33797 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8ADEC7922333A00B003CF0F5 /* Config.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; DEFINES_MODULE = YES; diff --git a/OSX.xcworkspace/contents.xcworkspacedata b/tvOS/Bugsnag.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 69% rename from OSX.xcworkspace/contents.xcworkspacedata rename to tvOS/Bugsnag.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 2ecb76f07..919434a62 100644 --- a/OSX.xcworkspace/contents.xcworkspacedata +++ b/tvOS/Bugsnag.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:">