V6 rebuild project

Bugsnag.podspec.json

@@ -1,7 +1,7 @@
 {
   "name": "Bugsnag",
   "version": "5.23.2",
-  "summary": "Cocoa notifier for SDK for bugsnag.com",
+  "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
   "authors": {
@@ -25,29 +25,29 @@
     "tvos": "9.2"
   },
   "source_files": [
-    "Source/{**/,}*.{m,h,mm,c}"
+    "Bugsnag/{**/,}*.{m,h,mm,c}"
   ],
   "requires_arc": true,
   "public_header_files": [
-    "Source/BSG_KSCrashReportWriter.h",
-    "Source/Bugsnag.h",
-    "Source/BugsnagApp.h",
-    "Source/BugsnagAppWithState.h",
-    "Source/BugsnagBreadcrumb.h",
-    "Source/BugsnagClient.h",
-    "Source/BugsnagConfiguration.h",
-    "Source/BugsnagDevice.h",
-    "Source/BugsnagDeviceWithState.h",
-    "Source/BugsnagEndpointConfiguration.h",
-    "Source/BugsnagError.h",
-    "Source/BugsnagErrorTypes.h",
-    "Source/BugsnagEvent.h",
-    "Source/BugsnagMetadata.h",
-    "Source/BugsnagMetadataStore.h",
-    "Source/BugsnagPlugin.h",
-    "Source/BugsnagSession.h",
-    "Source/BugsnagStackframe.h",
-    "Source/BugsnagThread.h",
-    "Source/BugsnagUser.h"
+    "Bugsnag/Bugsnag.h",
+    "Bugsnag/Client/BugsnagClient.h",
+    "Bugsnag/Configuration/BugsnagConfiguration.h",
+    "Bugsnag/Configuration/BugsnagEndpointConfiguration.h",
+    "Bugsnag/Configuration/BugsnagErrorTypes.h",
+    "Bugsnag/Metadata/BugsnagMetadata.h",
+    "Bugsnag/Metadata/BugsnagMetadataStore.h",
+    "Bugsnag/Payload/BugsnagApp.h",
+    "Bugsnag/Payload/BugsnagAppWithState.h",
+    "Bugsnag/Payload/BugsnagBreadcrumb.h",
+    "Bugsnag/Payload/BugsnagDevice.h",
+    "Bugsnag/Payload/BugsnagDeviceWithState.h",
+    "Bugsnag/Payload/BugsnagError.h",
+    "Bugsnag/Payload/BugsnagEvent.h",
+    "Bugsnag/Payload/BugsnagSession.h",
+    "Bugsnag/Payload/BugsnagStackframe.h",
+    "Bugsnag/Payload/BugsnagThread.h",
+    "Bugsnag/Payload/BugsnagUser.h",
+    "Bugsnag/Plugins/BugsnagPlugin.h",
+    "Bugsnag/BSG_KSCrashReportWriter.h"
   ]
 }

Project/Bugsnag.xcodeproj/xcshareddata/xcschemes/BugsnagStatic.xcscheme → Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-iOS.xcscheme

@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E7397DC31F83BAC50034242A"
-               BuildableName = "libBugsnagStatic.a"
-               BlueprintName = "BugsnagStatic"
+               BlueprintIdentifier = "00AD1C7124869B0E00A27979"
+               BuildableName = "Bugsnag.framework"
+               BlueprintName = "Bugsnag-iOS"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,8 +26,19 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00AD1C7A24869B0E00A27979"
+               BuildableName = "Bugsnag-iOSTests.xctest"
+               BlueprintName = "Bugsnag-iOSTests"
+               ReferencedContainer = "container:Bugsnag.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -50,9 +61,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E7397DC31F83BAC50034242A"
-            BuildableName = "libBugsnagStatic.a"
-            BlueprintName = "BugsnagStatic"
+            BlueprintIdentifier = "00AD1C7124869B0E00A27979"
+            BuildableName = "Bugsnag.framework"
+            BlueprintName = "Bugsnag-iOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Project/Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-macOS.xcscheme → Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-macOS.xcscheme

@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "009BBD612478369100731BF5"
+               BlueprintIdentifier = "00AD1CAC24869C1200A27979"
                BuildableName = "Bugsnag.framework"
                BlueprintName = "Bugsnag-macOS"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
@@ -26,15 +26,16 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "009BBD692478369200731BF5"
-               BuildableName = "Bugsnag-MacOSTests.xctest"
-               BlueprintName = "Bugsnag-MacOSTests"
+               BlueprintIdentifier = "00AD1CB424869C1200A27979"
+               BuildableName = "Bugsnag-macOSTests.xctest"
+               BlueprintName = "Bugsnag-macOSTests"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -60,7 +61,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "009BBD612478369100731BF5"
+            BlueprintIdentifier = "00AD1CAC24869C1200A27979"
             BuildableName = "Bugsnag.framework"
             BlueprintName = "Bugsnag-macOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">

Project/Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-tvOS.xcscheme → Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-tvOS.xcscheme

@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "009BBD7D2478370000731BF5"
+               BlueprintIdentifier = "00AD1CC824869C2400A27979"
                BuildableName = "Bugsnag.framework"
                BlueprintName = "Bugsnag-tvOS"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
@@ -26,13 +26,14 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "009BBD852478370100731BF5"
+               BlueprintIdentifier = "00AD1CD024869C2400A27979"
                BuildableName = "Bugsnag-tvOSTests.xctest"
                BlueprintName = "Bugsnag-tvOSTests"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
@@ -60,7 +61,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "009BBD7D2478370000731BF5"
+            BlueprintIdentifier = "00AD1CC824869C2400A27979"
             BuildableName = "Bugsnag.framework"
             BlueprintName = "Bugsnag-tvOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">

Project/TestsInfo.plist → Framework/Info.plist

@@ -13,11 +13,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Framework/module.modulemap

@@ -0,0 +1,6 @@
+framework module Bugsnag {
+    umbrella header "Bugsnag.h"
+
+    export *
+    module * { export * }
+}

Makefile

@@ -19,7 +19,7 @@
 PLATFORM?=iOS
 OS?=latest
 TEST_CONFIGURATION?=Debug
-BUILD_FLAGS=-project Project/Bugsnag.xcodeproj -scheme Bugsnag-$(PLATFORM) -derivedDataPath build/build-$(PLATFORM)
+BUILD_FLAGS=-project Bugsnag.xcodeproj -scheme Bugsnag-$(PLATFORM) -derivedDataPath build/build-$(PLATFORM)
 
 ifeq ($(PLATFORM),macOS)
  SDK?=macosx
@@ -71,7 +71,7 @@ bootstrap: ## Install development dependencies
 	@bundle install
 
 build_ios_static: ## Build the static library target
-	$(XCODEBUILD) -project Project/Bugsnag.xcodeproj -scheme BugsnagStatic
+	$(XCODEBUILD) -project Bugsnag.xcodeproj -scheme BugsnagStatic
 
 build_carthage: ## Build the latest pushed commit with Carthage
 	@mkdir -p features/fixtures/carthage-proj