Skip to content

Commit 341050f

Browse files
committed
Merge branch 'main' of github.com:getsentry/sentry-cocoa into itay/flutter_cross_platform_integration
2 parents bcd0c4d + 8c1cafc commit 341050f

37 files changed

+545
-439
lines changed

.github/last-release-runid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19824583024
1+
20106496041

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ jobs:
7575
timeout-minutes: 5 # 5 minutes timeout
7676
env:
7777
OS_VERSION: "18.4"
78-
run: ./sentry-cocoa/scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION"
78+
PLATFORM: "iOS"
79+
run: ./sentry-cocoa/scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION" --platform "$PLATFORM"
7980

8081
- name: Create simulator device for iOS 18.4
8182
run: ./sentry-cocoa/scripts/ci-create-simulator.sh --platform "iOS" --os-version "18.4" --device-name "iPhone 15 Pro"

.github/workflows/test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,13 @@ jobs:
118118
--remove-duplicate true \
119119
--change-path false \
120120
--remove-binary-targets true
121+
- name: Ensure required runtime is loaded
122+
# Ideally we will not need this, but CI sometimes is failing to load some runtimes, this will ensure they are loaded
123+
timeout-minutes: 5 # 5 minutes timeout
124+
env:
125+
OS_VERSION: "18.4"
126+
PLATFORM: "iOS"
127+
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION" --platform "$PLATFORM"
121128
- run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
122129
- run: set -o pipefail && NSUnbufferedIO=YES SKIP_BINARIES=1 xcodebuild test -scheme Sentry-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16 Pro' | tee raw-test-output-distribution.log | xcbeautify --preserve-unbeautified
123130
shell: sh

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,13 @@ jobs:
110110
run: ./scripts/ci-install-platforms.sh --platforms "$PLATFORM" --os-version "$OS_VERSION"
111111

112112
- name: Ensure required runtime is loaded
113+
if: ${{ inputs.platform == 'iOS' || inputs.platform == 'tvOS' }}
113114
# Ideally we will not need this, but CI sometimes is failing to load some runtimes, this will ensure they are loaded
114-
if: ${{ inputs.platform == 'iOS' }}
115115
timeout-minutes: 5 # 5 minutes timeout
116116
env:
117117
OS_VERSION: ${{ inputs.test-destination-os }}
118-
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION"
118+
PLATFORM: ${{ inputs.platform }}
119+
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION" --platform "$PLATFORM"
119120

120121
- name: Create simulator device
121122
if: ${{ inputs.create_device }}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ jobs:
107107
timeout-minutes: 5 # 5 minutes timeout
108108
env:
109109
OS_VERSION: "18.4"
110-
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION"
110+
PLATFORM: "iOS"
111+
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION" --platform "$PLATFORM"
111112

112113
- name: Boot simulator
113114
run: ./scripts/ci-boot-simulator.sh

.github/workflows/unit-test-common.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,13 @@ jobs:
9393
run: ./scripts/ci-install-platforms.sh --platforms "$PLATFORMS" --os-version "$OS_VERSION"
9494

9595
- name: Ensure required runtime is loaded
96+
if: ${{ inputs.platform == 'iOS' || inputs.platform == 'tvOS' || inputs.platform == 'visionOS' }}
9697
# Ideally we will not need this, but CI sometimes is failing to load some runtimes, this will ensure they are loaded
97-
if: ${{ inputs.platform == 'iOS' }}
9898
timeout-minutes: 5 # 5 minutes timeout
9999
env:
100100
OS_VERSION: ${{ inputs.test-destination-os }}
101-
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION"
101+
PLATFORM: ${{ inputs.platform }}
102+
run: ./scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION" --platform "$PLATFORM"
102103

103104
# Create simulator devices for non-preinstalled simulators
104105
# Required for iOS 16.4, iOS 17.5 (on Xcode 15.4), and iOS/tvOS 26.1

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22

3-
## Unreleased
3+
## 9.1.0
4+
5+
> [!Warning]
6+
> The class `SentryDsn` has been converted from Objective-C to Swift. While the public API remains the same, you might have to remove imports of the `SentryDsn.h` from your Objective-C code.
7+
> We acknowledge that this is a breaking change introduced in a minor release, but it should have been part of the major release 9.0.0 already before - apologies for any inconveniences caused.
8+
9+
### Breaking Changes
10+
11+
- Refactored type `SentryDsn` from Objective-C to Swift, removing the `SentryDsn.h` from the public header files.
412

513
### Features
614

Package.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@ var products: [Product] = [
2222
var targets: [Target] = [
2323
.binaryTarget(
2424
name: "Sentry",
25-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.0.0/Sentry.xcframework.zip",
26-
checksum: "e54ed4597496468737e917e7826d90a40ee98f4985554651e32ddfcd82050f27" //Sentry-Static
25+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.1.0/Sentry.xcframework.zip",
26+
checksum: "dbe8684753ee9590d2785edfd3ae2a48f4953cb7a8e5251de8a3b534238d9f93" //Sentry-Static
2727
),
2828
.binaryTarget(
2929
name: "Sentry-Dynamic",
30-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.0.0/Sentry-Dynamic.xcframework.zip",
31-
checksum: "9e7571fc539a6e6850e3d792a0afc9abe63c75261774da6b99d66f426e0c52f7" //Sentry-Dynamic
30+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.1.0/Sentry-Dynamic.xcframework.zip",
31+
checksum: "71d1e398eb21e933887a71289008df38a180ac3d0047d24301dec4e9977e52ac" //Sentry-Dynamic
3232
),
3333
.binaryTarget(
3434
name: "Sentry-Dynamic-WithARM64e",
35-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.0.0/Sentry-Dynamic-WithARM64e.xcframework.zip",
36-
checksum: "3b18bd46aff94b6536f20f905e2f0bb5e203fafb0f01da8dc45a5cc0c29c90c5" //Sentry-Dynamic-WithARM64e
35+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.1.0/Sentry-Dynamic-WithARM64e.xcframework.zip",
36+
checksum: "7104ff7d0a454a587eaefaf804ab63adabe6623803811ce47e33c516ae556be7" //Sentry-Dynamic-WithARM64e
3737
),
3838
.binaryTarget(
3939
name: "Sentry-WithoutUIKitOrAppKit",
40-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.0.0/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
41-
checksum: "62763254cc75d9616d91058d83e31a974a977b01bf92b229174fcc92395961a1" //Sentry-WithoutUIKitOrAppKit
40+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.1.0/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
41+
checksum: "8d1ddafc78732e3b03e8bfa2a2f41e6c914a938f06dd5f7330f47435553c21d1" //Sentry-WithoutUIKitOrAppKit
4242
),
4343
.binaryTarget(
4444
name: "Sentry-WithoutUIKitOrAppKit-WithARM64e",
45-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.0.0/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
46-
checksum: "62f69807006f5958942cc19b6741a31a3c4b35cc31c7555742a69725631c19df" //Sentry-WithoutUIKitOrAppKit-WithARM64e
45+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.1.0/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
46+
checksum: "e653ba630e9858c33090b24cb1be97c4d88a9e8157adab119eb100bf479bebf8" //Sentry-WithoutUIKitOrAppKit-WithARM64e
4747
),
4848
.target(
4949
name: "SentrySwiftUI",

Samples/iOS-Swift/iOS-Swift/Tools/iOS-Swift-Bridging-Header.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
#import "SentryBenchmarking.h"
33
#import "SentryExposure.h"
44
#import <Sentry/PrivateSentrySDKOnly.h>
5-
#import <Sentry/SentryDsn+Private.h>

Sentry.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Sentry"
3-
s.version = "9.0.0"
3+
s.version = "9.1.0"
44
s.summary = "Sentry client for cocoa"
55
s.homepage = "https://github.com/getsentry/sentry-cocoa"
66
s.license = "mit"

0 commit comments

Comments
 (0)