From cdb1700f6d564964a9d683cea0803c6adb8f4c78 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 8 Sep 2025 19:12:52 +0000 Subject: [PATCH 1/6] chore: update scripts/update-cocoa.sh to 8.55.1 --- CHANGELOG.md | 3 +++ buildSrc/src/main/java/Config.kt | 2 +- sentry-kotlin-multiplatform-gradle-plugin/gradle.properties | 2 +- .../sentry_kotlin_multiplatform.podspec | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18abef32..195b102d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - Bump Java SDK from v8.17.0 to v8.20.0 ([#454](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/454)) - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8200) - [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.20.0) +- Bump Cocoa SDK from v8.53.2 to v8.55.1 ([#455](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/455)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8551) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.53.2...8.55.1) ## 0.18.0 diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index a5b0a8bd..843272a1 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -37,7 +37,7 @@ object Config { val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion" val sentryJava = "io.sentry:sentry:$sentryJavaVersion" - val sentryCocoaVersion = "8.53.2" + val sentryCocoaVersion = "8.55.1" val sentryCocoa = "Sentry" object Samples { diff --git a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties index 257560cd..21330b34 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.18.0 group=io.sentry -sentryCocoaVersion=8.53.2 +sentryCocoaVersion=8.55.1 # 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 126f6651..4ab0f903 100644 --- a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec +++ b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |spec| spec.osx.deployment_target = '10.13' spec.tvos.deployment_target = '11.0' spec.watchos.deployment_target = '4.0' - spec.dependency 'Sentry', '8.53.2' + spec.dependency 'Sentry', '8.55.1' if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') raise " @@ -54,4 +54,4 @@ Pod::Spec.new do |spec| } ] -end \ No newline at end of file +end From b97e20b370547dac6a425f2890ec9bf5f7127b52 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Mon, 8 Sep 2025 21:15:04 +0200 Subject: [PATCH 2/6] Update --- .github/workflows/kotlin-multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kotlin-multiplatform.yml b/.github/workflows/kotlin-multiplatform.yml index 01c97893..117a716d 100644 --- a/.github/workflows/kotlin-multiplatform.yml +++ b/.github/workflows/kotlin-multiplatform.yml @@ -1,4 +1,4 @@ -name: "Lib: sentry-kotlin-multiplatform" +name: 'Lib: sentry-kotlin-multiplatform' on: push: branches: @@ -9,7 +9,7 @@ on: - '.github/workflows/kotlin-multiplatform.yml' - 'kotlin-multiplatform/**' - 'sentry-samples/**' - - 'buildSrc/src/' + - 'buildSrc/src/**' - '!**/*.md' concurrency: From b03fcc34a8705642ebf1092a184daf1c3b129b94 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Thu, 11 Sep 2025 02:54:58 +0200 Subject: [PATCH 3/6] Update --- .../sentry_kotlin_multiplatform.podspec | 2 +- sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock | 12 ++++++------ .../kmp-app-cocoapods/shared/shared.podspec | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec index 4ab0f903..22b2a9ba 100644 --- a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec +++ b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec @@ -54,4 +54,4 @@ Pod::Spec.new do |spec| } ] -end +end \ No newline at end of file diff --git a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock index 1bc0f2ca..7fcd833a 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.53.2): - - Sentry/Core (= 8.53.2) - - Sentry/Core (8.53.2) + - Sentry (8.55.1): + - Sentry/Core (= 8.55.1) + - Sentry/Core (8.55.1) - shared (1.0): - - Sentry (= 8.53.2) + - Sentry (= 8.55.1) DEPENDENCIES: - shared (from `../shared`) @@ -17,8 +17,8 @@ EXTERNAL SOURCES: :path: "../shared" SPEC CHECKSUMS: - Sentry: 59993bffde4a1ac297ba6d268dc4bbce068d7c1b - shared: 9b2a3232b0c4d2d6bbc43ce5b62b42e389e01c27 + Sentry: 6c92b12db0634612f6a66757890fea97e788fe12 + shared: 889fbc0d727dc0533f7fc04bee9d2d0418190291 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756 diff --git a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec index 0f856372..2bf7fd4d 100644 --- a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec +++ b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |spec| spec.vendored_frameworks = 'build/cocoapods/framework/shared.framework' spec.libraries = 'c++' spec.ios.deployment_target = '14.1' - spec.dependency 'Sentry', '8.53.2' + spec.dependency 'Sentry', '8.55.1' if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework') raise " From 4d6ea428bde3d5b802d6ba338acbc12297277bb3 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Thu, 11 Sep 2025 16:12:44 +0200 Subject: [PATCH 4/6] Update --- .../multiplatform/nsexception/SentryUnhandledExceptions.kt | 2 +- .../src/nativeInterop/cinterop/Sentry.Internal.def | 2 +- .../SentryInternal/{SentrySDK.h => SentrySDKInternal.h} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/{SentrySDK.h => SentrySDKInternal.h} (96%) 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 8f834964..c3bed646 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 @@ -20,7 +20,7 @@ import platform.Foundation.NSException import platform.Foundation.NSNumber private typealias InternalSentryEvent = Internal.Sentry.SentryEvent -private typealias InternalSentrySDK = Internal.Sentry.SentrySDK +private typealias InternalSentrySDK = Internal.Sentry.SentrySDKInternal private typealias InternalSentryEnvelope = Internal.Sentry.SentryEnvelope private typealias InternalSentryDependencyContainer = Internal.Sentry.SentryDependencyContainer private typealias InternalSentryEnvelopeHeader = Internal.Sentry.SentryEnvelopeHeader diff --git a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/Sentry.Internal.def b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/Sentry.Internal.def index 9b35615a..cd487995 100644 --- a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/Sentry.Internal.def +++ b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/Sentry.Internal.def @@ -1,5 +1,5 @@ language = Objective-C headers = SentryClient.h SentryDebugImageProvider.h SentryEnvelope.h \ SentryHub.h SentryScope.h \ SentryCrashMonitor_NSException.h SentryCrashMonitor_NSException+NSExceptionKt.h \ - SentryCrashStackCursor.h SentryDependencyContainer.h SentryHook.h SentrySDK.h \ + SentryCrashStackCursor.h SentryDependencyContainer.h SentryHook.h SentrySDKInternal.h \ SentryStacktraceBuilder.h SentryThreadInspector.h PrivateSentrySDKOnly.h \ diff --git a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDK.h b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDKInternal.h similarity index 96% rename from sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDK.h rename to sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDKInternal.h index c099f79d..c6c9fffe 100644 --- a/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDK.h +++ b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDKInternal.h @@ -19,7 +19,7 @@ #import #import -@interface SentrySDK : NSObject +@interface SentrySDKInternal : NSObject + (void)storeEnvelope:(SentryEnvelope *_Nonnull)envelope; + (SentryHub *_Nonnull)currentHub; From aadbf0f5ba5fa6f238f5b4eb3b1b48c517ce5c46 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Thu, 11 Sep 2025 16:33:21 +0200 Subject: [PATCH 5/6] Update --- sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.pbxproj b/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.pbxproj index 9b663553..b28dba98 100644 --- a/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.pbxproj +++ b/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.pbxproj @@ -424,7 +424,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa.git"; requirement = { kind = exactVersion; - version = 8.44.0; + version = 8.55.1; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9a638ee1..32e7de61 100644 --- a/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa.git", "state" : { - "revision" : "0c34e4da899a1dd9183db04082d1ceb6e9c2b301", - "version" : "8.44.0" + "revision" : "2c70925b98238b7efacde11d30075328c3cb6a2a", + "version" : "8.55.1" } } ], From ac20f89e9ac40fb208abcca4b2125b181778ab57 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 12 Sep 2025 00:11:39 +0200 Subject: [PATCH 6/6] Update --- .../kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt b/sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt index 71061b37..22178008 100644 --- a/sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt +++ b/sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt @@ -87,7 +87,7 @@ class SentryE2ETest : BaseSentryTest() { // See: https://github.com/getsentry/sentry-kotlin-multiplatform/issues/17 @Test - fun `capture message and fetch event from Sentry`() = runTest(timeout = 30.seconds) { + fun `capture message and fetch event from Sentry`() = runTest(timeout = 60.seconds) { if (platform != "Apple") { val message = "Test running on $platform" val eventId = Sentry.captureMessage(message)