Skip to content

Commit 9438e65

Browse files
committed
Merge branch 'main' of github.com:getsentry/sentry-cocoa into itay/cocoa-533-convert-sentryreachability-to-swift
2 parents 07abf89 + 78af7a9 commit 9438e65

File tree

107 files changed

+861
-1136
lines changed

Some content is hidden

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

107 files changed

+861
-1136
lines changed

.github/workflows/api-stability.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ jobs:
4646

4747
- name: Generate HEAD SDK
4848
run: |
49-
mv sdk_api_V9.json sdk_api_base.json
50-
./scripts/update-api.sh V9
51-
mv sdk_api_V9.json sdk_api.json
49+
mv sdk_api.json sdk_api_base.json
50+
./scripts/update-api.sh
5251
5352
- name: Diagnose breaking changes
5453
run: |

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ jobs:
7676
include:
7777
- scheme: macOS-Swift
7878
config: Debug
79-
- scheme: iOS13-Swift
80-
config: Debug
8179
- scheme: watchOS-Swift WatchKit App
8280
config: Debug
8381
- scheme: macOS-SwiftUI

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ jobs:
275275
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
276276
MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
277277
- name: Collect app metrics
278-
uses: getsentry/action-app-sdk-overhead-metrics@c9eca50e02d180ee07a02952c062b2f3f545f735
278+
uses: getsentry/action-app-sdk-overhead-metrics@4ccd0f993ff482b1ea5da556134ccace418190fb
279279
with:
280280
config: Tests/Perf/metrics-test.yml
281281
sauce-user: ${{ secrets.SAUCE_USERNAME }}

.github/workflows/test-cross-platform.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
with:
5656
repository: getsentry/sentry-react-native
5757
path: sentry-react-native
58+
ref: updateVersion
5859

5960
- name: Enable Corepack
6061
working-directory: sentry-react-native

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ jobs:
265265
- name: iOS 26 Sentry
266266
runs-on: macos-26
267267
platform: "iOS"
268-
xcode: "26.0"
268+
xcode: "26.0.1"
269269
test-destination-os: "26.0"
270270
device: "iPhone 17 Pro"
271271
scheme: "Sentry"
@@ -294,7 +294,7 @@ jobs:
294294
- name: macOS 26 Sentry
295295
runs-on: macos-26
296296
platform: "macOS"
297-
xcode: "26.0"
297+
xcode: "26.0.1"
298298
test-destination-os: "26.0"
299299
scheme: "Sentry"
300300

@@ -350,7 +350,7 @@ jobs:
350350
- name: tvOS 26 Sentry
351351
runs-on: macos-26
352352
platform: "tvOS"
353-
xcode: "26.0"
353+
xcode: "26.0.1"
354354
test-destination-os: "26.0"
355355
device: "Apple TV"
356356
scheme: "Sentry"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ jobs:
7979
env:
8080
XCODE_VERSION: ${{ inputs.xcode_version }}
8181
- name: Install required platforms for Xcode 26
82-
if: ${{ inputs.xcode_version == '26.0' }}
82+
if: ${{ inputs.xcode_version == '26.0.1' }}
8383
run: ./scripts/ci-install-xOS-26-platforms.sh --platforms "${{inputs.platform}}"
8484

8585
- name: Create simulator device for Xcode 26
86-
if: ${{ inputs.xcode_version == '26.0' }}
86+
if: ${{ inputs.xcode_version == '26.0.1' }}
8787
run: ./scripts/ci-create-simulator.sh --platform "${{inputs.platform}}" --os-version "${{inputs.test-destination-os}}" --device-name "${{inputs.device}}"
8888
- run: make init-ci-build
8989
if: ${{ inputs.build_with_make }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: iOS 26
7676
platform:
7777
runs-on: macos-15
78-
xcode: "26.0"
78+
xcode: "26.0.1"
7979
platform: "iOS"
8080
device: "iPhone 16 Pro"
8181
test-destination-os: "26.0"

.github/workflows/ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
- name: iOS 26
9898
runs-on: macos-15
9999
platform: "iOS"
100-
xcode: "26.0"
100+
xcode: "26.0.1"
101101
device: iPhone 16 Pro
102102
test-destination-os: "26.0"
103103
with:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.xcodeproj
8686
Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj
8787
Samples/iOS-Swift/iOS-Swift.xcodeproj
8888
Samples/iOS-Swift6/iOS-Swift6.xcodeproj
89-
Samples/iOS13-Swift/iOS13-Swift.xcodeproj
9089
Samples/iOS-SwiftUI/iOS-SwiftUI.xcodeproj
9190
Samples/iOS15-SwiftUI/iOS15-SwiftUI.xcodeproj
9291
Samples/macOS-Swift/macOS-Swift.xcodeproj

CHANGELOG-v9.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
### Breaking Changes
44

5-
Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
65
Removes unused SentryLogLevel (#5591)
76
Removes deprecated getStoreEndpoint (#5591)
87
Removes deprecated useSpan function (#5591)
98
Removes deprecated SentryDebugImageProvider class (#5598)
109
Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)
1110
Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
1211
Removes public SentrySerializable conformance from many public models (#5636, #5840, #5982)
13-
Removes Decodable conformances from the public API of model classes (#5691)
1412
Removes enableTracing property from SentryOptions (#5694)
1513
Removes deprecated `setExtraValue` from SentrySpan (#5864)
1614
Removes `integrations` property from `SentryOptions` (#5749)
1715
Makes `SentryEventDecodable` internal (#5808)
1816
The `span` property on `SentryScope` is now readonly (#5866)
19-
Removes `enablePerformanceV2` option and makes this the default (#6008)
20-
21-
### Fixes
22-
23-
Fixes warnings about minimum OS version being lower than Xcode supported version (#5591)
24-
25-
### Improvements

0 commit comments

Comments
 (0)