Merge branch 'main' into dependabot/github_actions/actions/setup-java-5

romtsn · web-flow · commit 708feb3a08cb · 2025-10-29T08:50:41.000+01:00
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -6,4 +6,6 @@ on:
 
 jobs:
   danger:
-    uses: getsentry/github-workflows/.github/workflows/danger.yml@v2
+    runs-on: ubuntu-latest
+    steps:
+      - uses: getsentry/github-workflows/danger@v3
diff --git 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:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## Unreleased
+
+### Dependencies
+
+- Bump Java SDK from v8.21.1 to v8.24.0 ([#472](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/472))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8240)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.21.1...8.24.0)
+
+## 0.19.0
+
+### Dependencies
+
+- Bump Java SDK from v8.17.0 to v8.21.0 ([#454](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/454), [#457](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/457))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8210)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.21.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
 
 ### Features
diff --git a/README.md b/README.md
@@ -62,6 +62,7 @@ Use the Kotlin Multiplatform and Cocoa SDK combinations listed in the table belo
 | 0.13.0                           | 8.49.1            |
 | 0.14.0                           | 8.53.1            |
 | 0.15.0, 0.16.0, 0.17.0, 0.17.1, 0.18.0 | 8.53.2      |
+| 0.19.0                     | 8.55.1            |
 
 ## Usage
 
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -33,11 +33,11 @@ object Config {
     object Libs {
         val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
 
-        val sentryJavaVersion = "8.17.0"
+        val sentryJavaVersion = "8.24.0"
         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/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ android.useAndroidX=true
 compose.version=1.3.1-rc01
 
 # Release information
-versionName=0.18.0
+versionName=0.19.0
 
 # Increase memory for in-process compiler execution.
 org.gradle.jvmargs=-Xmx6g
diff --git a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties
@@ -1,8 +1,8 @@
 id=io.sentry.kotlin.multiplatform.gradle
 implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
-versionName=0.18.0
+versionName=0.19.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
@@ -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 "
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
@@ -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/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)
diff --git 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/SentrySDKInternal.h b/sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryInternal/SentrySDKInternal.h
@@ -19,7 +19,7 @@
 #import <SentryEnvelope.h>
 #import <SentryHub.h>
 
-@interface SentrySDK : NSObject
+@interface SentrySDKInternal : NSObject
 
 + (void)storeEnvelope:(SentryEnvelope *_Nonnull)envelope;
 + (SentryHub *_Nonnull)currentHub;
diff --git 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
@@ -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 "
diff --git 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
