Skip to content

Commit 8dcc68b

Browse files
DariaKunoichiDariaKunoichi
authored
Merge pull request #1848 from bugsnag/release-v6.33.1
Release v6.33.1
2 parents fdf9fbf + 66ea740 commit 8dcc68b

18 files changed

Lines changed: 76 additions & 48 deletions

File tree

‎.github/workflows/pull_request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
DEVELOPER_DIR: /Applications/Xcode_15.4.app
1414
steps:
1515
- name: Checkout pull request HEAD
16-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717
with:
1818
ref: ${{ github.event.pull_request.head.sha }}
1919
- name: Install dependencies
@@ -30,13 +30,13 @@ jobs:
3030
runs-on: macos-14
3131
steps:
3232
- name: Checkout target branch
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
ref: ${{ github.base_ref }}
3636
- name: Build framework
3737
run: xcodebuild -project Bugsnag.xcodeproj -configuration Release -target Bugsnag-iOS -destination generic/platform=iOS -quiet clean build VALID_ARCHS=arm64 RUN_CLANG_STATIC_ANALYZER=NO && mv build build.base
3838
- name: Checkout pull request merge branch
39-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
clean: false
4242
fetch-depth: 100

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
with:
3737
persist-credentials: false
3838

@@ -68,6 +68,6 @@ jobs:
6868
# Upload the results to GitHub's code scanning dashboard (optional).
6969
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
71+
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
7272
with:
7373
sarif_file: results.sarif

‎.github/workflows/update_docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: macos-latest
1010
steps:
1111
- name: Checkout bugsnag-cocoa
12-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
12+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1313

1414
- name: Checkout docs branch
15-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
with:
1717
ref: gh-pages
1818
path: docs

‎.jazzy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ author_url: "https://www.bugsnag.com"
22
author: "Bugsnag Inc"
33
clean: false # avoid deleting docs/.git
44
framework_root: "Bugsnag"
5-
github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.33.0/Bugsnag"
5+
github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.33.1/Bugsnag"
66
github_url: "https://github.com/bugsnag/bugsnag-cocoa"
77
hide_documentation_coverage: true
88
module: "Bugsnag"
9-
module_version: "6.33.0"
9+
module_version: "6.33.1"
1010
objc: true
1111
output: "docs"
1212
readme: "README.md"

‎Bugsnag.podspec.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Bugsnag",
3-
"version": "6.33.0",
3+
"version": "6.33.1",
44
"summary": "The Bugsnag crash reporting framework for Apple platforms.",
55
"homepage": "https://bugsnag.com",
66
"license": "MIT",
@@ -9,7 +9,7 @@
99
},
1010
"source": {
1111
"git": "https://github.com/bugsnag/bugsnag-cocoa.git",
12-
"tag": "v6.33.0"
12+
"tag": "v6.33.1"
1313
},
1414
"ios": {
1515
"frameworks": [

‎Bugsnag.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,7 +4107,7 @@
41074107
INFOPLIST_FILE = ./Framework/Info.plist;
41084108
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
41094109
MACOSX_DEPLOYMENT_TARGET = 10.11;
4110-
MARKETING_VERSION = 6.33.0;
4110+
MARKETING_VERSION = 6.33.1;
41114111
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
41124112
MTL_FAST_MATH = YES;
41134113
ONLY_ACTIVE_ARCH = YES;
@@ -4151,7 +4151,7 @@
41514151
INFOPLIST_FILE = ./Framework/Info.plist;
41524152
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
41534153
MACOSX_DEPLOYMENT_TARGET = 10.11;
4154-
MARKETING_VERSION = 6.33.0;
4154+
MARKETING_VERSION = 6.33.1;
41554155
MTL_ENABLE_DEBUG_INFO = NO;
41564156
MTL_FAST_MATH = YES;
41574157
OTHER_LDFLAGS = (
@@ -4190,7 +4190,7 @@
41904190
"@executable_path/Frameworks",
41914191
"@loader_path/Frameworks",
41924192
);
4193-
MARKETING_VERSION = 6.33.0;
4193+
MARKETING_VERSION = 6.33.1;
41944194
MODULEMAP_FILE = "$(PROJECT_DIR)/Framework/module.modulemap";
41954195
SKIP_INSTALL = YES;
41964196
TARGETED_DEVICE_FAMILY = "1,2";
@@ -4215,7 +4215,7 @@
42154215
"@executable_path/Frameworks",
42164216
"@loader_path/Frameworks",
42174217
);
4218-
MARKETING_VERSION = 6.33.0;
4218+
MARKETING_VERSION = 6.33.1;
42194219
MODULEMAP_FILE = "$(PROJECT_DIR)/Framework/module.modulemap";
42204220
SKIP_INSTALL = YES;
42214221
TARGETED_DEVICE_FAMILY = "1,2";
@@ -4234,7 +4234,7 @@
42344234
"@executable_path/Frameworks",
42354235
"@loader_path/Frameworks",
42364236
);
4237-
MARKETING_VERSION = 6.33.0;
4237+
MARKETING_VERSION = 6.33.1;
42384238
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.BugsnagTests;
42394239
PRODUCT_NAME = "$(TARGET_NAME)";
42404240
SWIFT_OBJC_BRIDGING_HEADER = "Tests/BugsnagTests/Tests-Bridging-Header.h";
@@ -4255,7 +4255,7 @@
42554255
"@executable_path/Frameworks",
42564256
"@loader_path/Frameworks",
42574257
);
4258-
MARKETING_VERSION = 6.33.0;
4258+
MARKETING_VERSION = 6.33.1;
42594259
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.BugsnagTests;
42604260
PRODUCT_NAME = "$(TARGET_NAME)";
42614261
SWIFT_OBJC_BRIDGING_HEADER = "Tests/BugsnagTests/Tests-Bridging-Header.h";
@@ -4283,7 +4283,7 @@
42834283
"@executable_path/../Frameworks",
42844284
"@loader_path/Frameworks",
42854285
);
4286-
MARKETING_VERSION = 6.33.0;
4286+
MARKETING_VERSION = 6.33.1;
42874287
PRODUCT_NAME = Bugsnag;
42884288
SDKROOT = macosx;
42894289
SKIP_INSTALL = YES;
@@ -4307,7 +4307,7 @@
43074307
"@executable_path/../Frameworks",
43084308
"@loader_path/Frameworks",
43094309
);
4310-
MARKETING_VERSION = 6.33.0;
4310+
MARKETING_VERSION = 6.33.1;
43114311
PRODUCT_NAME = Bugsnag;
43124312
SDKROOT = macosx;
43134313
SKIP_INSTALL = YES;
@@ -4326,7 +4326,7 @@
43264326
"@executable_path/../Frameworks",
43274327
"@loader_path/../Frameworks",
43284328
);
4329-
MARKETING_VERSION = 6.33.0;
4329+
MARKETING_VERSION = 6.33.1;
43304330
PRODUCT_BUNDLE_IDENTIFIER = "com.bugsnag.Bugsnag-macOSTests";
43314331
PRODUCT_NAME = "$(TARGET_NAME)";
43324332
SDKROOT = macosx;
@@ -4346,7 +4346,7 @@
43464346
"@executable_path/../Frameworks",
43474347
"@loader_path/../Frameworks",
43484348
);
4349-
MARKETING_VERSION = 6.33.0;
4349+
MARKETING_VERSION = 6.33.1;
43504350
PRODUCT_BUNDLE_IDENTIFIER = "com.bugsnag.Bugsnag-macOSTests";
43514351
PRODUCT_NAME = "$(TARGET_NAME)";
43524352
SDKROOT = macosx;
@@ -4371,7 +4371,7 @@
43714371
"@executable_path/Frameworks",
43724372
"@loader_path/Frameworks",
43734373
);
4374-
MARKETING_VERSION = 6.33.0;
4374+
MARKETING_VERSION = 6.33.1;
43754375
PRODUCT_NAME = Bugsnag;
43764376
SDKROOT = appletvos;
43774377
SKIP_INSTALL = YES;
@@ -4394,7 +4394,7 @@
43944394
"@executable_path/Frameworks",
43954395
"@loader_path/Frameworks",
43964396
);
4397-
MARKETING_VERSION = 6.33.0;
4397+
MARKETING_VERSION = 6.33.1;
43984398
PRODUCT_NAME = Bugsnag;
43994399
SDKROOT = appletvos;
44004400
SKIP_INSTALL = YES;
@@ -4413,7 +4413,7 @@
44134413
"@executable_path/Frameworks",
44144414
"@loader_path/Frameworks",
44154415
);
4416-
MARKETING_VERSION = 6.33.0;
4416+
MARKETING_VERSION = 6.33.1;
44174417
PRODUCT_BUNDLE_IDENTIFIER = "com.bugsnag.Bugsnag-tvOSTests";
44184418
PRODUCT_NAME = "$(TARGET_NAME)";
44194419
SDKROOT = appletvos;
@@ -4433,7 +4433,7 @@
44334433
"@executable_path/Frameworks",
44344434
"@loader_path/Frameworks",
44354435
);
4436-
MARKETING_VERSION = 6.33.0;
4436+
MARKETING_VERSION = 6.33.1;
44374437
PRODUCT_BUNDLE_IDENTIFIER = "com.bugsnag.Bugsnag-tvOSTests";
44384438
PRODUCT_NAME = "$(TARGET_NAME)";
44394439
SDKROOT = appletvos;
@@ -4449,7 +4449,7 @@
44494449
buildSettings = {
44504450
CODE_SIGN_STYLE = Automatic;
44514451
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
4452-
MARKETING_VERSION = 6.33.0;
4452+
MARKETING_VERSION = 6.33.1;
44534453
PRODUCT_NAME = "$(TARGET_NAME)";
44544454
SKIP_INSTALL = YES;
44554455
TARGETED_DEVICE_FAMILY = "1,2";
@@ -4462,7 +4462,7 @@
44624462
buildSettings = {
44634463
CODE_SIGN_STYLE = Automatic;
44644464
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
4465-
MARKETING_VERSION = 6.33.0;
4465+
MARKETING_VERSION = 6.33.1;
44664466
PRODUCT_NAME = "$(TARGET_NAME)";
44674467
SKIP_INSTALL = YES;
44684468
TARGETED_DEVICE_FAMILY = "1,2";
@@ -4480,7 +4480,7 @@
44804480
"$(inherited)",
44814481
"@executable_path/Frameworks",
44824482
);
4483-
MARKETING_VERSION = 6.33.0;
4483+
MARKETING_VERSION = 6.33.1;
44844484
PRODUCT_BUNDLE_IDENTIFIER = "com.bugsnag.TestHost-iOS";
44854485
PRODUCT_NAME = "$(TARGET_NAME)";
44864486
TARGETED_DEVICE_FAMILY = "1,2";
@@ -4498,7 +4498,7 @@
44984498
"$(inherited)",
44994499
"@executable_path/Frameworks",
45004500
);
4501-
MARKETING_VERSION = 6.33.0;
4501+
MARKETING_VERSION = 6.33.1;
45024502
PRODUCT_BUNDLE_IDENTIFIER = "com.bugsnag.TestHost-iOS";
45034503
PRODUCT_NAME = "$(TARGET_NAME)";
45044504
TARGETED_DEVICE_FAMILY = "1,2";
@@ -4554,7 +4554,7 @@
45544554
"@executable_path/Frameworks",
45554555
"@loader_path/Frameworks",
45564556
);
4557-
MARKETING_VERSION = 6.33.0;
4557+
MARKETING_VERSION = 6.33.1;
45584558
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.Bugsnag;
45594559
PRODUCT_NAME = Bugsnag;
45604560
SDKROOT = watchos;
@@ -4612,7 +4612,7 @@
46124612
"@executable_path/Frameworks",
46134613
"@loader_path/Frameworks",
46144614
);
4615-
MARKETING_VERSION = 6.33.0;
4615+
MARKETING_VERSION = 6.33.1;
46164616
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.Bugsnag;
46174617
PRODUCT_NAME = Bugsnag;
46184618
SDKROOT = watchos;
@@ -4659,7 +4659,7 @@
46594659
GCC_WARN_UNUSED_FUNCTION = YES;
46604660
GCC_WARN_UNUSED_VARIABLE = YES;
46614661
GENERATE_INFOPLIST_FILE = YES;
4662-
MARKETING_VERSION = 6.33.0;
4662+
MARKETING_VERSION = 6.33.1;
46634663
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.BugsnagTests;
46644664
PRODUCT_NAME = "$(TARGET_NAME)";
46654665
SDKROOT = watchos;
@@ -4706,7 +4706,7 @@
47064706
GCC_WARN_UNUSED_FUNCTION = YES;
47074707
GCC_WARN_UNUSED_VARIABLE = YES;
47084708
GENERATE_INFOPLIST_FILE = YES;
4709-
MARKETING_VERSION = 6.33.0;
4709+
MARKETING_VERSION = 6.33.1;
47104710
PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.BugsnagTests;
47114711
PRODUCT_NAME = "$(TARGET_NAME)";
47124712
SDKROOT = watchos;

‎Bugsnag/BugsnagInternals.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,12 @@ BUGSNAG_EXTERN BSGBreadcrumbType BSGBreadcrumbTypeFromString(NSString * _Nullabl
7575
#pragma mark -
7676

7777
typedef NS_ENUM(NSInteger, BSGClientObserverEvent) {
78-
BSGClientObserverAddFeatureFlag, // value: BugsnagFeatureFlag
79-
BSGClientObserverClearFeatureFlag, // value: NSString
80-
BSGClientObserverUpdateContext, // value: NSString
81-
BSGClientObserverUpdateMetadata, // value: BugsnagMetadata
82-
BSGClientObserverUpdateUser, // value: BugsnagUser
78+
BSGClientObserverAddFeatureFlag, // value: BugsnagFeatureFlag
79+
BSGClientObserverClearFeatureFlag, // value: NSString
80+
BSGClientObserverUpdateContext, // value: NSString
81+
BSGClientObserverUpdateMetadata, // value: BugsnagMetadata
82+
BSGClientObserverUpdateUser, // value: BugsnagUser
83+
BSGClientObserverUpdateGroupingDiscriminator, // value: NSString
8384
};
8485

8586
typedef void (^ BSGClientObserver)(BSGClientObserverEvent event, _Nullable id value);

‎Bugsnag/Client/BugsnagClient.m‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,9 @@ - (NSString *_Nullable)setGroupingDiscriminator:(NSString *_Nullable)groupingDis
657657
NSString *previous = self.groupingDiscriminator_;
658658
self.groupingDiscriminator_ = groupingDiscriminator;
659659
[self.state addMetadata:groupingDiscriminator withKey:BSGKeyGroupingDiscriminator toSection:BSGKeyClient];
660+
if (self.observer) {
661+
self.observer(BSGClientObserverUpdateGroupingDiscriminator, groupingDiscriminator);
662+
}
660663
return previous;
661664
}
662665
}
@@ -1030,7 +1033,8 @@ - (void)setObserver:(BSGClientObserver)observer {
10301033
if (observer) {
10311034
observer(BSGClientObserverUpdateContext, self.context);
10321035
observer(BSGClientObserverUpdateUser, self.user);
1033-
1036+
observer(BSGClientObserverUpdateGroupingDiscriminator, self.groupingDiscriminator);
1037+
10341038
observer(BSGClientObserverUpdateMetadata, self.metadata);
10351039
self.metadata.observer = ^(BugsnagMetadata *metadata) {
10361040
observer(BSGClientObserverUpdateMetadata, metadata);

‎Bugsnag/Payload/BugsnagNotifier.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ - (instancetype)init {
2323
#else
2424
_name = @"Bugsnag Objective-C";
2525
#endif
26-
_version = @"6.33.0";
26+
_version = @"6.33.1";
2727
_url = @"https://github.com/bugsnag/bugsnag-cocoa";
2828
_dependencies = @[];
2929
}

‎BugsnagNetworkRequestPlugin.podspec.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "BugsnagNetworkRequestPlugin",
3-
"version": "6.33.0",
3+
"version": "6.33.1",
44
"summary": "Network request monitoring support for Bugsnag.",
55
"homepage": "https://bugsnag.com",
66
"license": "MIT",
77
"authors": {
88
"Bugsnag": "notifiers@bugsnag.com"
99
},
10-
"readme": "https://raw.githubusercontent.com/bugsnag/bugsnag-cocoa/v6.33.0/BugsnagNetworkRequestPlugin/README.md",
10+
"readme": "https://raw.githubusercontent.com/bugsnag/bugsnag-cocoa/v6.33.1/BugsnagNetworkRequestPlugin/README.md",
1111
"source": {
1212
"git": "https://github.com/bugsnag/bugsnag-cocoa.git",
13-
"tag": "v6.33.0"
13+
"tag": "v6.33.1"
1414
},
1515
"dependencies": {
1616
"Bugsnag": "~> 6.13"

0 commit comments

Comments
 (0)