Skip to content

Commit ae1094f

Browse files
robert-smartbearrobert-smartbear
authored
Merge pull request #1910 from bugsnag/release-v6.35.0
Release v6.35.0
2 parents f4348c2 + c47354f commit ae1094f

57 files changed

Lines changed: 2132 additions & 1061 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/pipeline.full.yml‎

Lines changed: 147 additions & 310 deletions
Large diffs are not rendered by default.

‎.buildkite/pipeline.yml‎

Lines changed: 342 additions & 572 deletions
Large diffs are not rendered by default.

‎.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
33+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
4040
with:
4141
clean: false
4242
fetch-depth: 100

‎.github/workflows/scorecard.yml‎

Lines changed: 3 additions & 3 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3636
with:
3737
persist-credentials: false
3838

@@ -59,7 +59,7 @@ jobs:
5959
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6060
# format to the repository Actions tab.
6161
- name: "Upload artifact"
62-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v3.pre.node20
62+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v3.pre.node20
6363
with:
6464
name: SARIF file
6565
path: results.sarif
@@ -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@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
71+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1313

1414
- name: Checkout docs branch
15-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
15+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
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.34.1/Bugsnag"
5+
github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.35.0/Bugsnag"
66
github_url: "https://github.com/bugsnag/bugsnag-cocoa"
77
hide_documentation_coverage: true
88
module: "Bugsnag"
9-
module_version: "6.34.1"
9+
module_version: "6.35.0"
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.34.1",
3+
"version": "6.35.0",
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.34.1"
12+
"tag": "v6.35.0"
1313
},
1414
"ios": {
1515
"frameworks": [

‎Bugsnag.xcodeproj/project.pbxproj‎

Lines changed: 56 additions & 22 deletions
Large diffs are not rendered by default.

‎Bugsnag.xcodeproj/xcshareddata/xcschemes/Bugsnag-macOS.xcscheme‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,16 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
disableMainThreadChecker = "YES"
30-
codeCoverageEnabled = "YES"
31-
shouldUseLaunchSchemeArgsEnv = "YES">
31+
codeCoverageEnabled = "YES">
32+
<AdditionalOptions>
33+
<AdditionalOption
34+
key = "MallocScribble"
35+
value = ""
36+
isEnabled = "YES">
37+
</AdditionalOption>
38+
</AdditionalOptions>
3239
<Testables>
3340
<TestableReference
3441
skipped = "NO">
@@ -51,13 +58,6 @@
5158
</BuildableReference>
5259
</TestableReference>
5360
</Testables>
54-
<AdditionalOptions>
55-
<AdditionalOption
56-
key = "MallocScribble"
57-
value = ""
58-
isEnabled = "YES">
59-
</AdditionalOption>
60-
</AdditionalOptions>
6161
</TestAction>
6262
<LaunchAction
6363
buildConfiguration = "Debug"
@@ -78,8 +78,6 @@
7878
ReferencedContainer = "container:Bugsnag.xcodeproj">
7979
</BuildableReference>
8080
</MacroExpansion>
81-
<AdditionalOptions>
82-
</AdditionalOptions>
8381
</LaunchAction>
8482
<ProfileAction
8583
buildConfiguration = "Release"

‎Bugsnag/Bugsnag.m‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,28 +109,56 @@ + (void)markLaunchCompleted {
109109
+ (void)notify:(NSException *)exception {
110110
if ([self bugsnagReadyForInternalCalls]) {
111111
BSGPreventInlining(@"Prevent");
112-
[self.client notifyErrorOrException:exception stackStripDepth:2 block:nil];
112+
[self.client notifyErrorOrException:exception stackStripDepth:2 options:nil block:nil];
113+
}
114+
}
115+
116+
+ (void)notify:(NSException *)exception options:(BugsnagErrorOptions *)options{
117+
if ([self bugsnagReadyForInternalCalls]) {
118+
BSGPreventInlining(@"Prevent");
119+
[self.client notifyErrorOrException:exception stackStripDepth:2 options:options block:nil];
113120
}
114121
}
115122

116123
+ (void)notify:(NSException *)exception block:(BugsnagOnErrorBlock)block {
117124
if ([self bugsnagReadyForInternalCalls]) {
118125
BSGPreventInlining(@"inlining");
119-
[self.client notifyErrorOrException:exception stackStripDepth:2 block:block];
126+
[self.client notifyErrorOrException:exception stackStripDepth:2 options:nil block:block];
127+
}
128+
}
129+
130+
+ (void)notify:(NSException *)exception options:(BugsnagErrorOptions *)options block:(BugsnagOnErrorBlock)block {
131+
if ([self bugsnagReadyForInternalCalls]) {
132+
BSGPreventInlining(@"inlining");
133+
[self.client notifyErrorOrException:exception stackStripDepth:2 options:options block:block];
120134
}
121135
}
122136

123137
+ (void)notifyError:(NSError *)error {
124138
if ([self bugsnagReadyForInternalCalls]) {
125139
BSGPreventInlining(@"and");
126-
[self.client notifyErrorOrException:error stackStripDepth:2 block:nil];
140+
[self.client notifyErrorOrException:error stackStripDepth:2 options:nil block:nil];
141+
}
142+
}
143+
144+
+ (void)notifyError:(NSError *)error options:(BugsnagErrorOptions *)options{
145+
if ([self bugsnagReadyForInternalCalls]) {
146+
BSGPreventInlining(@"and");
147+
[self.client notifyErrorOrException:error stackStripDepth:2 options:options block:nil];
127148
}
128149
}
129150

130151
+ (void)notifyError:(NSError *)error block:(BugsnagOnErrorBlock)block {
131152
if ([self bugsnagReadyForInternalCalls]) {
132153
BSGPreventInlining(@"outlining");
133-
[self.client notifyErrorOrException:error stackStripDepth:2 block:block];
154+
[self.client notifyErrorOrException:error stackStripDepth:2 options:nil block:block];
155+
}
156+
}
157+
158+
+ (void)notifyError:(NSError *)error options:(BugsnagErrorOptions *)options block:(BugsnagOnErrorBlock)block {
159+
if ([self bugsnagReadyForInternalCalls]) {
160+
BSGPreventInlining(@"outlining");
161+
[self.client notifyErrorOrException:error stackStripDepth:2 options:options block:block];
134162
}
135163
}
136164

0 commit comments

Comments
 (0)