Skip to content

Commit f28091d

Browse files
authored
Merge branch 'main' into armcknight/feat/expose-feedback-theme-settings
2 parents b8734a2 + d170e0d commit f28091d

File tree

41 files changed

+894
-56
lines changed

Some content is hidden

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

41 files changed

+894
-56
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
229229
MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
230230
- name: Collect app metrics
231-
uses: getsentry/action-app-sdk-overhead-metrics@v1
231+
uses: getsentry/action-app-sdk-overhead-metrics@c9eca50e02d180ee07a02952c062b2f3f545f735
232232
with:
233233
config: Tests/Perf/metrics-test.yml
234234
sauce-user: ${{ secrets.SAUCE_USERNAME }}

.github/workflows/ui-tests-critical.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
run-swiftui-crash-test:
5353
name: Run SwiftUI Crash Test
5454
runs-on: macos-15
55+
timeout-minutes: 15
5556
steps:
5657
- uses: actions/checkout@v4
5758

.github/workflows/ui-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
- "Samples/iOS-Swift/**"
1919
- "Samples/iOS-Swift6/**"
2020
- "Samples/SentrySampleShared/**"
21+
- "Samples/Shared/**"
2122
- "scripts/build-xcframework-slice.sh"
2223
- "scripts/assemble-xcframework.sh"
2324
- ".github/workflows/build-xcframework-variant-slices.yml"
@@ -47,7 +48,7 @@ jobs:
4748
uses: ./.github/workflows/ui-tests-common.yml
4849
with:
4950
fastlane_command: ui_tests_ios_swiftui
50-
xcode_version: 16.2
51+
xcode_version: 16.4
5152
build_with_make: true
5253
macos_version: macos-15
5354
fastlane_command_extra_arguments: device:"iPhone 16 (18.5)"

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
### Fixes
66

77
- Set handled to false for fatal app hangs (#5514)
8+
- User feedback widget automatically injects into SwiftUI apps correctly (#5223)
9+
- Fix crash when SentryFileManger is nil (#5535)
10+
11+
### Improvements
12+
13+
- Removed `APPLICATION_EXTENSION_API_ONLY` requirement (#5524)
814

915
### Improvements
1016

Plans/SentrySwiftUI_Base.xctestplan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12+
"codeCoverage" : true,
1213
"uiTestingScreenshotsLifetime" : "keepAlways"
1314
},
1415
"testTargets" : [

Plans/Sentry_Base.xctestplan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12+
"codeCoverage" : true,
1213
"environmentVariableEntries" : [
1314
{
1415
"key" : "TSAN_OPTIONS",

Plans/SwiftUITestSample_Base.xctestplan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12+
"codeCoverage" : true,
1213
"uiTestingScreenshotsLifetime" : "keepAlways"
1314
},
1415
"testTargets" : [

Plans/iOS-ObjectiveC_Base.xctestplan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12+
"codeCoverage" : true,
1213
"uiTestingScreenshotsLifetime" : "keepAlways"
1314
},
1415
"testTargets" : [

Plans/iOS-Swift6_Base.xctestplan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12+
"codeCoverage" : true,
1213
"uiTestingScreenshotsLifetime" : "keepAlways"
1314
},
1415
"testTargets" : [

Plans/iOS-SwiftUI_Base.xctestplan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
],
1111
"defaultOptions" : {
12-
"codeCoverage" : false,
12+
"codeCoverage" : true,
1313
"targetForVariableExpansion" : {
1414
"containerPath" : "container:iOS-SwiftUI.xcodeproj",
1515
"identifier" : "7BB6224826A56C4E00D0E75E",

0 commit comments

Comments
 (0)