build: Consolidate projects into one

Fixes an issue mentioned in #418 where the Bugsnag project would build multiple times, once for each architecture.
bugsnag · Oct 10, 2019 · efb15b9 · efb15b9
1 parent d65082b
commit efb15b9
Show file tree

Hide file tree

Showing 29 changed files with 168 additions and 3,032 deletions.
diff --git a/iOS/Bugsnag.xcodeproj/project.pbxproj → Bugsnag.xcodeproj/project.pbxproj b/iOS/Bugsnag.xcodeproj/project.pbxproj → Bugsnag.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...j/xcshareddata/xcschemes/Bugsnag.xcscheme b/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...j/xcshareddata/xcschemes/Bugsnag.xcscheme
diff --git 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=-scheme Bugsnag -derivedDataPath build
 
 ifeq ($(PLATFORM),OSX)
  SDK?=macosx

diff --git a/OSX/Bugsnag.xcodeproj/project.pbxproj b/OSX/Bugsnag.xcodeproj/project.pbxproj
diff --git a/OSX/Bugsnag.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/OSX/Bugsnag.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/OSX/Bugsnag.xcodeproj/project.xcworkspace/xcshareddata/Bugsnag.xcscmblueprint b/OSX/Bugsnag.xcodeproj/project.xcworkspace/xcshareddata/Bugsnag.xcscmblueprint
diff --git a/OSX/Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag.xcscheme b/OSX/Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag.xcscheme
diff --git a/OSX/Info.plist b/OSX/Info.plist
diff --git a/OSX/module.modulemap b/OSX/module.modulemap
diff --git a/iOS/Info.plist → Source/Info.plist b/iOS/Info.plist → Source/Info.plist
diff --git a/OSX/TestsInfo.plist → Source/TestsInfo.plist b/OSX/TestsInfo.plist → Source/TestsInfo.plist
diff --git a/...ugsnagTests/BSGOutOfMemoryWatchdogTests.m → Tests/BSGOutOfMemoryWatchdogTests.m b/...ugsnagTests/BSGOutOfMemoryWatchdogTests.m → Tests/BSGOutOfMemoryWatchdogTests.m
diff --git a/...BugsnagCrashReportFromKSCrashReportTest.m → ...BugsnagCrashReportFromKSCrashReportTest.m b/...BugsnagCrashReportFromKSCrashReportTest.m → ...BugsnagCrashReportFromKSCrashReportTest.m
diff --git a/...agTests/BugsnagKSCrashSysInfoParserTest.m → Tests/BugsnagKSCrashSysInfoParserTest.m b/...agTests/BugsnagKSCrashSysInfoParserTest.m → Tests/BugsnagKSCrashSysInfoParserTest.m
@@ -35,7 +35,9 @@ - (void)validateDeviceDict:(NSDictionary *)device {
     XCTAssertNotNil(device);
     XCTAssertNotNil(device[@"locale"]);
     XCTAssertNotNil(device[@"freeDisk"]);
+#if TARGET_OS_IPHONE || TARGET_OS_TV
     XCTAssertNotNil(device[@"simulator"]);
+#endif
 }
 
 - (void)testDeviceFreeSpaceShouldBeLargeNumber {

diff --git a/iOS/BugsnagTests/BugsnagThreadTest.m → Tests/BugsnagThreadTest.m b/iOS/BugsnagTests/BugsnagThreadTest.m → Tests/BugsnagThreadTest.m
diff --git a/iOS/BugsnagTests/RegisterErrorDataTest.m → Tests/RegisterErrorDataTest.m b/iOS/BugsnagTests/RegisterErrorDataTest.m → Tests/RegisterErrorDataTest.m
diff --git a/iOS/Bugsnag copy-Info.plist b/iOS/Bugsnag copy-Info.plist
diff --git a/iOS/Bugsnag.xcodeproj/project.xcworkspace/xcshareddata/Bugsnag.xcscmblueprint b/iOS/Bugsnag.xcodeproj/project.xcworkspace/xcshareddata/Bugsnag.xcscmblueprint
diff --git a/iOS/TestsInfo.plist b/iOS/TestsInfo.plist
diff --git a/iOS/module.modulemap → module.modulemap b/iOS/module.modulemap → module.modulemap