Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update Cocoa SDK to v8.48.0 #345

Merged
merged 3 commits into from
Apr 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## Unreleased

### Dependencies

- Bump Cocoa SDK from v8.44.0 to v8.48.0 ([#345](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/345))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8480)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.44.0...8.48.0)

## 0.11.0

### Fixes
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Config {
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"

val sentryCocoaVersion = "8.44.0"
val sentryCocoaVersion = "8.48.0"
val sentryCocoa = "Sentry"

object Samples {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id=io.sentry.kotlin.multiplatform.gradle
implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
versionName=0.11.0
group=io.sentry
sentryCocoaVersion=8.44.0
sentryCocoaVersion=8.48.0

# publication pom properties
POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ Pod::Spec.new do |spec|
spec.summary = 'Official Sentry SDK Kotlin Multiplatform'
spec.vendored_frameworks = 'build/cocoapods/framework/sentry_kotlin_multiplatform.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '11.0'
spec.osx.deployment_target = '10.13'
spec.tvos.deployment_target = '11.0'
spec.watchos.deployment_target = '4.0'
spec.dependency 'Sentry', '8.44.0'
spec.ios.deployment_target = '11.0'
spec.osx.deployment_target = '10.13'
spec.tvos.deployment_target = '11.0'
spec.watchos.deployment_target = '4.0'
spec.dependency 'Sentry', '8.48.0'

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

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':sentry-kotlin-multiplatform',
'PRODUCT_MODULE_NAME' => 'sentry_kotlin_multiplatform',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private typealias CocoapodsSentryThread = cocoapods.Sentry.SentryThread
*/
internal fun dropKotlinCrashEvent(event: CocoapodsSentryEvent?): CocoapodsSentryEvent? {
return event?.takeUnless {
(it as InternalSentryEvent).isCrashEvent && (
(it as InternalSentryEvent).isFatalEvent && (
it.tags?.containsKey(
KOTLIN_CRASH_TAG
) ?: false
Expand Down Expand Up @@ -75,7 +75,7 @@ internal fun Throwable.asSentryEnvelope(): InternalSentryEnvelope {
val event = asSentryEvent() as InternalSentryEvent
val preparedEvent = InternalSentrySDK.currentHub().let { hub ->
hub.getClient()
?.prepareEvent(event, hub.scope, alwaysAttachStacktrace = false, isCrashEvent = true)
?.prepareEvent(event, hub.scope, alwaysAttachStacktrace = false, isFatalEvent = true)
} ?: event
val item = InternalSentryEnvelopeItem(preparedEvent)
// TODO: pass traceState when enabling performance monitoring for KMP SDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
- (SentryEvent *_Nullable)prepareEvent:(SentryEvent *_Nonnull)event
withScope:(SentryScope *_Nonnull)scope
alwaysAttachStacktrace:(BOOL)alwaysAttachStacktrace
isCrashEvent:(BOOL)isCrashEvent;
isFatalEvent:(BOOL)isFatalEvent;

@end
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

@interface SentryEvent : NSObject

@property (nonatomic, assign) BOOL isCrashEvent;
@property (nonatomic, assign) BOOL isFatalEvent;

@property (nonatomic, strong) SentryId *eventId;

Expand Down
14 changes: 7 additions & 7 deletions sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- Sentry (8.44.0):
- Sentry/Core (= 8.44.0)
- Sentry/Core (8.44.0)
- Sentry (8.48.0):
- Sentry/Core (= 8.48.0)
- Sentry/Core (8.48.0)
- shared (1.0):
- Sentry (= 8.44.0)
- Sentry (= 8.48.0)

DEPENDENCIES:
- shared (from `../shared`)
Expand All @@ -17,9 +17,9 @@ EXTERNAL SOURCES:
:path: "../shared"

SPEC CHECKSUMS:
Sentry: 0f9bc9adfc0b960e7f3bb5ec67e9a3d8193f3bdb
shared: 74c25c5ceba3c4351dc1bcb324c17f211def6ebf
Sentry: 1ca8405451040482877dcd344dfa3ef80b646631
shared: a39a59e646f40aca21465f5b57c0ba28df8aaf8e

PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
8 changes: 6 additions & 2 deletions sentry-samples/kmp-app-cocoapods/shared/shared.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Pod::Spec.new do |spec|
spec.summary = 'Some description for the Shared Module'
spec.vendored_frameworks = 'build/cocoapods/framework/shared.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '14.1'
spec.dependency 'Sentry', '8.44.0'
spec.ios.deployment_target = '14.1'
spec.dependency 'Sentry', '8.48.0'

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

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':sentry-samples:kmp-app-cocoapods:shared',
'PRODUCT_MODULE_NAME' => 'shared',
Expand Down