Converge all three platforms to what was iOS, building and passing al…

…l unit tests - Removed .cpp source file specifier from podspec - Unshared schemes - Remove tvOS and OSX projects - Renamed iOS project to Project
bugsnag · May 27, 2020 · 7a4911e · 7a4911e
1 parent f819b89
commit 7a4911e
Show file tree

Hide file tree

Showing 37 changed files with 1,477 additions and 3,602 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,12 +28,12 @@ jobs:
   - osx_image: xcode10.2 # macos 10.14
     name: macOS 10.14 unit tests
     stage: macOS unit tests
-    env: PLATFORM=OSX
+    env: PLATFORM=macOS
 
   - osx_image: xcode9.4 # macos 10.13
     name: macOS 10.13 unit tests
     stage: macOS unit tests
-    env: PLATFORM=OSX
+    env: PLATFORM=macOS
 
   # ----------------------------------------------------------------------------
   # Unit Tests - iOS & tvOS

diff --git a/Bugsnag.podspec.json b/Bugsnag.podspec.json
@@ -25,7 +25,7 @@
     "tvos": "9.0"
   },
   "source_files": [
-    "Source/{**/,}*.{m,h,mm,c,cpp}"
+    "Source/{**/,}*.{m,h,mm,c}"
   ],
   "requires_arc": true,
   "public_header_files": [

diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 PLATFORM?=iOS
 OS?=latest
 TEST_CONFIGURATION?=Debug
-BUILD_FLAGS=-project $(PLATFORM)/Bugsnag.xcodeproj -scheme Bugsnag -derivedDataPath build
+BUILD_FLAGS=-project Project/Bugsnag.xcodeproj -scheme Bugsnag-$(PLATFORM) -derivedDataPath build/build-$(PLATFORM)
 
-ifeq ($(PLATFORM),OSX)
+ifeq ($(PLATFORM),macOS)
  SDK?=macosx
  RELEASE_DIR=Release
  BUILD_ONLY_FLAGS=-sdk $(SDK) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
@@ -95,8 +95,8 @@ endif
 	@EXPANDED_CODE_SIGN_IDENTITY="" EXPANDED_CODE_SIGN_IDENTITY_NAME="" EXPANDED_PROVISIONING_PROFILE="" pod trunk push --allow-warnings
 
 clean: ## Clean build artifacts
-	@$(XCODEBUILD) $(BUILD_FLAGS) clean $(FORMATTER)
-	@rm -rf build
+	@set -x && $(XCODEBUILD) $(BUILD_FLAGS) clean $(FORMATTER)
+	@rm -rf build-$(PLATFORM)
 
 test: ## Run unit tests
 	@$(XCODEBUILD) $(BUILD_FLAGS) $(BUILD_ONLY_FLAGS) test $(FORMATTER)

diff --git a/OSX/Bugsnag.xcodeproj/project.pbxproj b/OSX/Bugsnag.xcodeproj/project.pbxproj
diff --git a/OSX/Bugsnag.xcodeproj/project.xcworkspace/xcshareddata/Bugsnag.xcscmblueprint b/OSX/Bugsnag.xcodeproj/project.xcworkspace/xcshareddata/Bugsnag.xcscmblueprint
diff --git a/OSX/Info.plist b/OSX/Info.plist
diff --git a/iOS/Bugsnag.xcodeproj/project.pbxproj → Project/Bugsnag.xcodeproj/project.pbxproj b/iOS/Bugsnag.xcodeproj/project.pbxproj → Project/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/...space/xcshareddata/Bugsnag.xcscmblueprint → ...space/xcshareddata/Bugsnag.xcscmblueprint b/...space/xcshareddata/Bugsnag.xcscmblueprint → ...space/xcshareddata/Bugsnag.xcscmblueprint
diff --git a/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...shareddata/xcschemes/Bugsnag-iOS.xcscheme b/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...shareddata/xcschemes/Bugsnag-iOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8A2C8F171C6BBD2300846019"
                BuildableName = "Bugsnag.framework"
-               BlueprintName = "Bugsnag"
+               BlueprintName = "Bugsnag-iOS"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -34,7 +34,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8A2C8F171C6BBD2300846019"
             BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
+            BlueprintName = "Bugsnag-iOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -43,7 +43,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8A2C8F171C6BBD2300846019"
             BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
+            BlueprintName = "Bugsnag-iOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
@@ -53,8 +53,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8A2C8F211C6BBD2300846019"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
+               BuildableName = "Bugsnag-iOSTests.xctest"
+               BlueprintName = "Bugsnag-iOSTests"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -75,7 +75,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8A2C8F171C6BBD2300846019"
             BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
+            BlueprintName = "Bugsnag-iOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -91,7 +91,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8A2C8F171C6BBD2300846019"
             BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
+            BlueprintName = "Bugsnag-iOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...areddata/xcschemes/Bugsnag-macOS.xcscheme b/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...areddata/xcschemes/Bugsnag-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,42 +14,31 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8A8D51231D41343500D33797"
+               BlueprintIdentifier = "009BBD612478369100731BF5"
                BuildableName = "Bugsnag.framework"
-               BlueprintName = "Bugsnag"
+               BlueprintName = "Bugsnag-macOS"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8AB151111D41356800C9B218"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
+               BlueprintIdentifier = "009BBD692478369200731BF5"
+               BuildableName = "Bugsnag-MacOSTests.xctest"
+               BlueprintName = "Bugsnag-MacOSTests"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8A8D51231D41343500D33797"
-            BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
-            ReferencedContainer = "container:Bugsnag.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,17 +50,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8A8D51231D41343500D33797"
-            BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
-            ReferencedContainer = "container:Bugsnag.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -82,9 +60,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8A8D51231D41343500D33797"
+            BlueprintIdentifier = "009BBD612478369100731BF5"
             BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
+            BlueprintName = "Bugsnag-macOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...hareddata/xcschemes/Bugsnag-tvOS.xcscheme b/...j/xcshareddata/xcschemes/Bugsnag.xcscheme → ...hareddata/xcschemes/Bugsnag-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,42 +14,31 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8A2C8FA01C6BC1F700846019"
+               BlueprintIdentifier = "009BBD7D2478370000731BF5"
                BuildableName = "Bugsnag.framework"
-               BlueprintName = "Bugsnag"
+               BlueprintName = "Bugsnag-tvOS"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8A2C8FAA1C6BC1F700846019"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
+               BlueprintIdentifier = "009BBD852478370100731BF5"
+               BuildableName = "Bugsnag-tvOSTests.xctest"
+               BlueprintName = "Bugsnag-tvOSTests"
                ReferencedContainer = "container:Bugsnag.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8A2C8FA01C6BC1F700846019"
-            BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
-            ReferencedContainer = "container:Bugsnag.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,17 +50,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8A2C8FA01C6BC1F700846019"
-            BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
-            ReferencedContainer = "container:Bugsnag.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -82,9 +60,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8A2C8FA01C6BC1F700846019"
+            BlueprintIdentifier = "009BBD7D2478370000731BF5"
             BuildableName = "Bugsnag.framework"
-            BlueprintName = "Bugsnag"
+            BlueprintName = "Bugsnag-tvOS"
             ReferencedContainer = "container:Bugsnag.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...ugsnagTests/BSGOutOfMemoryWatchdogTests.m → ...ugsnagTests/BSGOutOfMemoryWatchdogTests.m b/...ugsnagTests/BSGOutOfMemoryWatchdogTests.m → ...ugsnagTests/BSGOutOfMemoryWatchdogTests.m
diff --git a/...Tests/BugsnagEventFromKSCrashReportTest.m → ...Tests/BugsnagEventFromKSCrashReportTest.m b/...Tests/BugsnagEventFromKSCrashReportTest.m → ...Tests/BugsnagEventFromKSCrashReportTest.m
diff --git a/...nagTests/BugsnagThreadSerializationTest.m → ...nagTests/BugsnagThreadSerializationTest.m b/...nagTests/BugsnagThreadSerializationTest.m → ...nagTests/BugsnagThreadSerializationTest.m
diff --git a/iOS/BugsnagTests/RegisterErrorDataTest.m → Project/BugsnagTests/RegisterErrorDataTest.m b/iOS/BugsnagTests/RegisterErrorDataTest.m → Project/BugsnagTests/RegisterErrorDataTest.m
diff --git a/...ts/Swift Tests/BugsnagMetadataTests.swift → ...ts/Swift Tests/BugsnagMetadataTests.swift b/...ts/Swift Tests/BugsnagMetadataTests.swift → ...ts/Swift Tests/BugsnagMetadataTests.swift
diff --git a/...ests/BugsnagSwiftConfigurationTests.swift → ...ests/BugsnagSwiftConfigurationTests.swift b/...ests/BugsnagSwiftConfigurationTests.swift → ...ests/BugsnagSwiftConfigurationTests.swift
diff --git a/...Tests/Swift Tests/BugsnagSwiftTests.swift → ...Tests/Swift Tests/BugsnagSwiftTests.swift b/...Tests/Swift Tests/BugsnagSwiftTests.swift → ...Tests/Swift Tests/BugsnagSwiftTests.swift
diff --git a/iOS/BugsnagTests/Tests-Bridging-Header.h → Project/BugsnagTests/Tests-Bridging-Header.h b/iOS/BugsnagTests/Tests-Bridging-Header.h → Project/BugsnagTests/Tests-Bridging-Header.h
diff --git a/iOS/Info.plist → Project/Info.plist b/iOS/Info.plist → Project/Info.plist
diff --git a/OSX/TestsInfo.plist → Project/TestsInfo.plist b/OSX/TestsInfo.plist → Project/TestsInfo.plist
diff --git a/OSX/module.modulemap → Project/module.modulemap b/OSX/module.modulemap → Project/module.modulemap
diff --git a/Tests/BugsnagBaseUnitTest.m b/Tests/BugsnagBaseUnitTest.m
@@ -27,7 +27,6 @@ @implementation BugsnagBaseUnitTest
  * We take the former approach.
  *
  * @param willNotify Whether the notifier should actually send the event to the server
- * @param willPersistUser Whether any user information should be persisted
  */
 
 -(void)setUpBugsnagWillCallNotify:(bool)willNotify