Skip to content

Commit afb9a27

Browse files
github-actions[bot]web-flowbuenaflor
authored
chore(deps): update Cocoa SDK to v8.48.0 (#345)
* chore: update scripts/update-cocoa.sh to 8.48.0 * Fix ci * Update isCrashEvent API to isFatalEvent --------- Co-authored-by: GitHub <[email protected]> Co-authored-by: Giancarlo Buenaflor <[email protected]>
1 parent b7b5ecc commit afb9a27

File tree

9 files changed

+36
-20
lines changed

9 files changed

+36
-20
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Dependencies
6+
7+
- Bump Cocoa SDK from v8.44.0 to v8.48.0 ([#345](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/345))
8+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8480)
9+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.44.0...8.48.0)
10+
311
## 0.11.0
412

513
### Fixes

buildSrc/src/main/java/Config.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Config {
3636
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
3737
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
3838

39-
val sentryCocoaVersion = "8.44.0"
39+
val sentryCocoaVersion = "8.48.0"
4040
val sentryCocoa = "Sentry"
4141

4242
object Samples {

sentry-kotlin-multiplatform-gradle-plugin/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ id=io.sentry.kotlin.multiplatform.gradle
22
implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
33
versionName=0.11.0
44
group=io.sentry
5-
sentryCocoaVersion=8.44.0
5+
sentryCocoaVersion=8.48.0
66

77
# publication pom properties
88
POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin

sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec

+9-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Pod::Spec.new do |spec|
88
spec.summary = 'Official Sentry SDK Kotlin Multiplatform'
99
spec.vendored_frameworks = 'build/cocoapods/framework/sentry_kotlin_multiplatform.framework'
1010
spec.libraries = 'c++'
11-
spec.ios.deployment_target = '11.0'
12-
spec.osx.deployment_target = '10.13'
13-
spec.tvos.deployment_target = '11.0'
14-
spec.watchos.deployment_target = '4.0'
15-
spec.dependency 'Sentry', '8.44.0'
11+
spec.ios.deployment_target = '11.0'
12+
spec.osx.deployment_target = '10.13'
13+
spec.tvos.deployment_target = '11.0'
14+
spec.watchos.deployment_target = '4.0'
15+
spec.dependency 'Sentry', '8.48.0'
1616

1717
if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework')
1818
raise "
@@ -25,6 +25,10 @@ Pod::Spec.new do |spec|
2525
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2626
end
2727

28+
spec.xcconfig = {
29+
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
30+
}
31+
2832
spec.pod_target_xcconfig = {
2933
'KOTLIN_PROJECT_PATH' => ':sentry-kotlin-multiplatform',
3034
'PRODUCT_MODULE_NAME' => 'sentry_kotlin_multiplatform',

sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/nsexception/SentryUnhandledExceptions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private typealias CocoapodsSentryThread = cocoapods.Sentry.SentryThread
3939
*/
4040
internal fun dropKotlinCrashEvent(event: CocoapodsSentryEvent?): CocoapodsSentryEvent? {
4141
return event?.takeUnless {
42-
(it as InternalSentryEvent).isCrashEvent && (
42+
(it as InternalSentryEvent).isFatalEvent && (
4343
it.tags?.containsKey(
4444
KOTLIN_CRASH_TAG
4545
) ?: false
@@ -75,7 +75,7 @@ internal fun Throwable.asSentryEnvelope(): InternalSentryEnvelope {
7575
val event = asSentryEvent() as InternalSentryEvent
7676
val preparedEvent = InternalSentrySDK.currentHub().let { hub ->
7777
hub.getClient()
78-
?.prepareEvent(event, hub.scope, alwaysAttachStacktrace = false, isCrashEvent = true)
78+
?.prepareEvent(event, hub.scope, alwaysAttachStacktrace = false, isFatalEvent = true)
7979
} ?: event
8080
val item = InternalSentryEnvelopeItem(preparedEvent)
8181
// TODO: pass traceState when enabling performance monitoring for KMP SDK

sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryClient.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
- (SentryEvent *_Nullable)prepareEvent:(SentryEvent *_Nonnull)event
2929
withScope:(SentryScope *_Nonnull)scope
3030
alwaysAttachStacktrace:(BOOL)alwaysAttachStacktrace
31-
isCrashEvent:(BOOL)isCrashEvent;
31+
isFatalEvent:(BOOL)isFatalEvent;
3232

3333
@end

sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryEvent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
@interface SentryEvent : NSObject
2424

25-
@property (nonatomic, assign) BOOL isCrashEvent;
25+
@property (nonatomic, assign) BOOL isFatalEvent;
2626

2727
@property (nonatomic, strong) SentryId *eventId;
2828

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- Sentry (8.44.0):
3-
- Sentry/Core (= 8.44.0)
4-
- Sentry/Core (8.44.0)
2+
- Sentry (8.48.0):
3+
- Sentry/Core (= 8.48.0)
4+
- Sentry/Core (8.48.0)
55
- shared (1.0):
6-
- Sentry (= 8.44.0)
6+
- Sentry (= 8.48.0)
77

88
DEPENDENCIES:
99
- shared (from `../shared`)
@@ -17,9 +17,9 @@ EXTERNAL SOURCES:
1717
:path: "../shared"
1818

1919
SPEC CHECKSUMS:
20-
Sentry: 0f9bc9adfc0b960e7f3bb5ec67e9a3d8193f3bdb
21-
shared: 74c25c5ceba3c4351dc1bcb324c17f211def6ebf
20+
Sentry: 1ca8405451040482877dcd344dfa3ef80b646631
21+
shared: a39a59e646f40aca21465f5b57c0ba28df8aaf8e
2222

2323
PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
2424

25-
COCOAPODS: 1.15.2
25+
COCOAPODS: 1.16.2

sentry-samples/kmp-app-cocoapods/shared/shared.podspec

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Pod::Spec.new do |spec|
88
spec.summary = 'Some description for the Shared Module'
99
spec.vendored_frameworks = 'build/cocoapods/framework/shared.framework'
1010
spec.libraries = 'c++'
11-
spec.ios.deployment_target = '14.1'
12-
spec.dependency 'Sentry', '8.44.0'
11+
spec.ios.deployment_target = '14.1'
12+
spec.dependency 'Sentry', '8.48.0'
1313

1414
if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
1515
raise "
@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
2222
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2323
end
2424

25+
spec.xcconfig = {
26+
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
27+
}
28+
2529
spec.pod_target_xcconfig = {
2630
'KOTLIN_PROJECT_PATH' => ':sentry-samples:kmp-app-cocoapods:shared',
2731
'PRODUCT_MODULE_NAME' => 'shared',

0 commit comments

Comments
 (0)