diff --git a/CHANGELOG.md b/CHANGELOG.md index 22269b73..cb4cdeeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index e6289fc8..28f3eb23 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -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 { diff --git a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties index 48f36a4b..c7406cd6 100644 --- a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties +++ b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties @@ -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 diff --git a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec index 96249f5d..3f25f636 100644 --- a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec +++ b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec @@ -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 " @@ -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', diff --git a/sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/nsexception/SentryUnhandledExceptions.kt b/sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/nsexception/SentryUnhandledExceptions.kt index d23ed25e..8f834964 100644 --- a/sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/nsexception/SentryUnhandledExceptions.kt +++ b/sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/nsexception/SentryUnhandledExceptions.kt @@ -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 @@ -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 diff --git a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryClient.h b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryClient.h index 3203a233..eb1f5248 100644 --- a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryClient.h +++ b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryClient.h @@ -28,6 +28,6 @@ - (SentryEvent *_Nullable)prepareEvent:(SentryEvent *_Nonnull)event withScope:(SentryScope *_Nonnull)scope alwaysAttachStacktrace:(BOOL)alwaysAttachStacktrace - isCrashEvent:(BOOL)isCrashEvent; + isFatalEvent:(BOOL)isFatalEvent; @end diff --git a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryEvent.h b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryEvent.h index 9f02eea8..600eae4c 100644 --- a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryEvent.h +++ b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentryEvent.h @@ -22,7 +22,7 @@ @interface SentryEvent : NSObject -@property (nonatomic, assign) BOOL isCrashEvent; +@property (nonatomic, assign) BOOL isFatalEvent; @property (nonatomic, strong) SentryId *eventId; diff --git a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock index 4ab69ff4..cba74889 100644 --- a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock +++ b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock @@ -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`) @@ -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 diff --git a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec index a6637b32..b091f983 100644 --- a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec +++ b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec @@ -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 " @@ -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',