Merge pull request #1467 from bugsnag/release-v6.22.2

Release v6.22.2
bugsnag · Aug 17, 2022 · 64570c1 · 64570c1
2 parents bd0465c + e807ef1
commit 64570c1
Show file tree

Hide file tree

Showing 37 changed files with 270 additions and 459 deletions.
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
@@ -26,7 +26,7 @@ steps:
           - "--device=IOS_14"
           - "--appium-version=1.21.0"
           - "--fail-fast"
-          - "--exclude=features/[h-z].*.feature$"
+          - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -55,7 +55,7 @@ steps:
           - "--device=IOS_14"
           - "--appium-version=1.21.0"
           - "--fail-fast"
-          - "--exclude=features/[a-g].*.feature$"
+          - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -84,7 +84,7 @@ steps:
           - "--device=IOS_13"
           - "--appium-version=1.17.0"
           - "--fail-fast"
-          - "--exclude=features/[h-z].*.feature$"
+          - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -113,7 +113,7 @@ steps:
           - "--device=IOS_13"
           - "--appium-version=1.17.0"
           - "--fail-fast"
-          - "--exclude=features/[a-g].*.feature$"
+          - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -142,7 +142,7 @@ steps:
           - "--device=IOS_12"
           - "--appium-version=1.17.0"
           - "--fail-fast"
-          - "--exclude=features/[h-z].*.feature$"
+          - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -171,7 +171,7 @@ steps:
           - "--device=IOS_12"
           - "--appium-version=1.17.0"
           - "--fail-fast"
-          - "--exclude=features/[a-g].*.feature$"
+          - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -202,7 +202,7 @@ steps:
           - "--device=IOS_11_0_IPHONE_8_PLUS"
           - "--appium-version=1.8.0"
           - "--fail-fast"
-          - "--exclude=features/[h-z].*.feature$"
+          - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -233,7 +233,7 @@ steps:
           - "--device=IOS_11_0_IPHONE_8_PLUS"
           - "--appium-version=1.8.0"
           - "--fail-fast"
-          - "--exclude=features/[a-g].*.feature$"
+          - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -281,6 +281,7 @@ steps:
         --os=macos
         --os-version=12
         --app=macOSTestApp
+        --fail-fast
         --order=random
 
   - label: 'macOS 10.13 E2E tests'

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -235,7 +235,7 @@ steps:
           - "--device=IOS_15"
           - "--appium-version=1.21.0"
           - "--fail-fast"
-          - "--exclude=features/[h-z].*.feature$"
+          - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -264,7 +264,7 @@ steps:
           - "--device=IOS_15"
           - "--appium-version=1.21.0"
           - "--fail-fast"
-          - "--exclude=features/[a-g].*.feature$"
+          - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -293,7 +293,8 @@ steps:
           - "--device=IOS_10"
           - "--appium-version=1.8.0"
           - "--capabilities={\"browserstack.networkLogs\":\"true\"}"
-          - "--exclude=features/[h-z].*.feature$"
+          - "--fail-fast"
+          - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -321,7 +322,8 @@ steps:
           - "--farm=bs"
           - "--device=IOS_10"
           - "--appium-version=1.8.0"
-          - "--exclude=features/[a-g].*.feature$"
+          - "--fail-fast"
+          - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
     concurrency: 24
     concurrency_group: browserstack-app
@@ -392,6 +394,7 @@ steps:
         --os=macos
         --os-version=12
         --app=macOSTestApp
+        --fail-fast
         --order=random
 
   - label: 'macOS 12 stress test'

diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -2,11 +2,11 @@ author_url: "https://www.bugsnag.com"
 author: "Bugsnag Inc"
 clean: false # avoid deleting docs/.git
 framework_root: "Bugsnag"
-github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.22.1/Bugsnag"
+github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.22.2/Bugsnag"
 github_url: "https://github.com/bugsnag/bugsnag-cocoa"
 hide_documentation_coverage: true
 module: "Bugsnag"
-module_version: "6.22.1"
+module_version: "6.22.2"
 objc: true
 output: "docs"
 readme: "README.md"

diff --git a/Bugsnag.podspec.json b/Bugsnag.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.22.1"
+    "tag": "v6.22.2"
   },
   "ios": {
     "frameworks": [

diff --git a/Bugsnag.xcodeproj/project.pbxproj b/Bugsnag.xcodeproj/project.pbxproj
@@ -621,9 +621,6 @@
 		0163BF5925823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0163BF5825823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m */; };
 		0163BF5A25823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0163BF5825823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m */; };
 		0163BF5B25823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0163BF5825823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m */; };
-		016875C6258D003200DFFF69 /* NSUserDefaultsStub.m in Sources */ = {isa = PBXBuildFile; fileRef = 016875C5258D003200DFFF69 /* NSUserDefaultsStub.m */; };
-		016875C7258D003200DFFF69 /* NSUserDefaultsStub.m in Sources */ = {isa = PBXBuildFile; fileRef = 016875C5258D003200DFFF69 /* NSUserDefaultsStub.m */; };
-		016875C8258D003200DFFF69 /* NSUserDefaultsStub.m in Sources */ = {isa = PBXBuildFile; fileRef = 016875C5258D003200DFFF69 /* NSUserDefaultsStub.m */; };
 		017DCF8C2874212F000ECB22 /* BSGTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 017DCF8A2874212F000ECB22 /* BSGTelemetry.h */; };
 		017DCF8D2874212F000ECB22 /* BSGTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 017DCF8A2874212F000ECB22 /* BSGTelemetry.h */; };
 		017DCF8E2874212F000ECB22 /* BSGTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 017DCF8A2874212F000ECB22 /* BSGTelemetry.h */; };
@@ -849,7 +846,6 @@
 		CB28F0C4282A488B003AB200 /* BugsnagApiClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CB9103632502320A00E9D1E2 /* BugsnagApiClientTest.m */; };
 		CB28F0C5282A49D5003AB200 /* URLSessionMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 01E8765D256684E700F4B70A /* URLSessionMock.m */; };
 		CB28F0C6282A49E5003AB200 /* TestSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = CBA2249A251E429C00B87416 /* TestSupport.m */; };
-		CB28F0C7282A49EF003AB200 /* NSUserDefaultsStub.m in Sources */ = {isa = PBXBuildFile; fileRef = 016875C5258D003200DFFF69 /* NSUserDefaultsStub.m */; };
 		CB28F0C8282A49F8003AB200 /* BugsnagTestsDummyClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 008966D12486D43600DC48C2 /* BugsnagTestsDummyClass.m */; };
 		CB28F0C9282A4A19003AB200 /* BugsnagApiValidationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E701FA9E2490EF4A008D842F /* BugsnagApiValidationTest.m */; };
 		CB28F0CA282A4A2E003AB200 /* BugsnagClientMirrorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 008966CA2486D43600DC48C2 /* BugsnagClientMirrorTest.m */; };
@@ -1581,8 +1577,6 @@
 		0154E20128070AEA009044E4 /* BSGRunContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BSGRunContext.m; sourceTree = "<group>"; };
 		015F528325C15BB7000D1915 /* MRCCanary.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MRCCanary.m; sourceTree = "<group>"; };
 		0163BF5825823D8D008DC28B /* BSGNotificationBreadcrumbsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BSGNotificationBreadcrumbsTests.m; sourceTree = "<group>"; };
-		016875C4258D003200DFFF69 /* NSUserDefaultsStub.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSUserDefaultsStub.h; sourceTree = "<group>"; };
-		016875C5258D003200DFFF69 /* NSUserDefaultsStub.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSUserDefaultsStub.m; sourceTree = "<group>"; };
 		017824BD262D65A000D18AFA /* Bugsnag.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Bugsnag.xcconfig; sourceTree = "<group>"; };
 		017DCF8A2874212F000ECB22 /* BSGTelemetry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BSGTelemetry.h; sourceTree = "<group>"; };
 		017DCF8B2874212F000ECB22 /* BSGTelemetry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BSGTelemetry.m; sourceTree = "<group>"; };
@@ -2084,8 +2078,6 @@
 				01BDB21425DEC02900A91FAF /* Data */,
 				E701FAAA2490EFD9008D842F /* EventApiValidationTest.m */,
 				00E636C324878FFC006CBF1A /* Info.plist */,
-				016875C4258D003200DFFF69 /* NSUserDefaultsStub.h */,
-				016875C5258D003200DFFF69 /* NSUserDefaultsStub.m */,
 				01B14C55251CE55F00118748 /* report-react-native-promise-rejection.json */,
 				008966B72486D43500DC48C2 /* report.json */,
 				004E35392487B375007FBAE4 /* Tests-Bridging-Header.h */,
@@ -3217,7 +3209,6 @@
 				01DE903C26CEAF9E00455213 /* BSGUtilsTests.m in Sources */,
 				008966F42486D43700DC48C2 /* BugsnagThreadTests.m in Sources */,
 				008967692486D43700DC48C2 /* BugsnagSessionTrackerTest.m in Sources */,
-				016875C6258D003200DFFF69 /* NSUserDefaultsStub.m in Sources */,
 				CB3744A428475F2A00A3955E /* BSG_KSCrashStringConversionTest.m in Sources */,
 				008967032486D43700DC48C2 /* BugsnagThreadSerializationTest.m in Sources */,
 				0089674B2486D43700DC48C2 /* BSGConnectivityTest.m in Sources */,
@@ -3381,7 +3372,6 @@
 				008967A62486D43700DC48C2 /* KSString_Tests.m in Sources */,
 				004E353D2487B3B8007FBAE4 /* BugsnagSwiftTests.swift in Sources */,
 				008967192486D43700DC48C2 /* BugsnagErrorTest.m in Sources */,
-				016875C7258D003200DFFF69 /* NSUserDefaultsStub.m in Sources */,
 				008967162486D43700DC48C2 /* BugsnagCollectionsTests.m in Sources */,
 				008967582486D43700DC48C2 /* BugsnagClientMirrorTest.m in Sources */,
 				0089676A2486D43700DC48C2 /* BugsnagSessionTrackerTest.m in Sources */,
@@ -3602,7 +3592,6 @@
 				01847DAE26441A5E00ADA4C7 /* BSGInternalErrorReporterTests.m in Sources */,
 				01B74E9E27903326004B9765 /* BSG_KSFileTests.m in Sources */,
 				004E35372487AFF2007FBAE4 /* BugsnagHandledStateTest.m in Sources */,
-				016875C8258D003200DFFF69 /* NSUserDefaultsStub.m in Sources */,
 				01935AE3275E68E9007498B3 /* UIApplicationStub.m in Sources */,
 				CB3744A628475F2B00A3955E /* BSG_KSCrashStringConversionTest.m in Sources */,
 				01C17AE92542ED7F00C102C9 /* KSCrashReportWriterTests.m in Sources */,
@@ -3867,7 +3856,6 @@
 				CB28F0AE28294D4F003AB200 /* KSSystemInfo_Tests.m in Sources */,
 				CB28F0E1282A4BEF003AB200 /* BugsnagPluginTest.m in Sources */,
 				CB28F11F282A7C97003AB200 /* BugsnagSwiftPublicAPITests.swift in Sources */,
-				CB28F0C7282A49EF003AB200 /* NSUserDefaultsStub.m in Sources */,
 				CB28F0BF282A4842003AB200 /* BSGStorageMigratorV0V1Tests.m in Sources */,
 				CB28F0AB28294D4F003AB200 /* KSLogger_Tests.m in Sources */,
 				CB28F126282A7DB0003AB200 /* ClientApiValidationTest.m in Sources */,

diff --git a/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.h b/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.h
@@ -12,10 +12,6 @@
 @class BugsnagConfiguration;
 typedef struct BSG_KSCrashReportWriter BSG_KSCrashReportWriter;
 
-typedef void (^BSGBreadcrumbConfiguration)(BugsnagBreadcrumb *_Nonnull);
-
-#pragma mark -
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface BugsnagBreadcrumbs : NSObject
@@ -28,16 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, nonatomic) NSArray<BugsnagBreadcrumb *> *breadcrumbs;
 
 /**
- * Store a new breadcrumb with a provided message.
- */
-- (void)addBreadcrumb:(NSString *)breadcrumbMessage;
-
-/**
- *  Store a new breadcrumb configured via block.
- *
- *  @param block configuration block
+ * Store a new breadcrumb.
  */
-- (void)addBreadcrumbWithBlock:(BSGBreadcrumbConfiguration)block;
+- (void)addBreadcrumb:(BugsnagBreadcrumb *)breadcrumb;
 
 /**
  * Store a new serialized breadcrumb.

diff --git a/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.m b/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.m
@@ -97,18 +97,11 @@ - (instancetype)initWithConfiguration:(BugsnagConfiguration *)config {
     });
 }
 
-- (void)addBreadcrumb:(NSString *)breadcrumbMessage {
-    [self addBreadcrumbWithBlock:^(BugsnagBreadcrumb *_Nonnull crumb) {
-        crumb.message = breadcrumbMessage;
-    }];
-}
-
-- (void)addBreadcrumbWithBlock:(BSGBreadcrumbConfiguration)block {
+- (void)addBreadcrumb:(BugsnagBreadcrumb *)crumb {
     if (self.maxBreadcrumbs == 0) {
         return;
     }
-    BugsnagBreadcrumb *crumb = [BugsnagBreadcrumb breadcrumbWithBlock:block];
-    if (!crumb || ![self shouldSendBreadcrumb:crumb]) {
+    if (![crumb isValid] || ![self shouldSendBreadcrumb:crumb]) {
         return;
     }
     NSData *data = [self dataForBreadcrumb:crumb];

diff --git a/Bugsnag/Bugsnag.m b/Bugsnag/Bugsnag.m
@@ -155,13 +155,6 @@ + (void)leaveBreadcrumbWithMessage:(NSString *)message {
     }
 }
 
-+ (void)leaveBreadcrumbWithBlock:
-    (void (^_Nonnull)(BugsnagBreadcrumb *_Nonnull))block {
-    if ([self bugsnagStarted]) {
-        [self.client addBreadcrumbWithBlock:block];
-    }
-}
-
 + (void)leaveBreadcrumbForNotificationName:
     (NSString *_Nonnull)notificationName {
     if ([self bugsnagStarted]) {

diff --git a/Bugsnag/Client/BugsnagClient+Private.h b/Bugsnag/Client/BugsnagClient+Private.h
@@ -89,14 +89,12 @@ typedef void (^ BSGClientObserver)(BSGClientObserverEvent event, _Nullable id va
 
 @property (strong, nonatomic) BugsnagSystemState *systemState;
 
-@property (nonatomic) BugsnagUser *user;
+@property (readonly, atomic) BugsnagUser *user;
 
 @property (nullable, nonatomic) BSGClientObserver observer; // Used in BugsnagReactNative
 
 #pragma mark Methods
 
-- (void)addBreadcrumbWithBlock:(void (^)(BugsnagBreadcrumb *))block;
-
 - (void)addRuntimeVersionInfo:(NSString *)info withKey:(NSString *)key;
 
 - (NSDictionary *)collectAppWithState; // Used in BugsnagReactNative