Merge branch 'main' into deps/scripts/update-java.sh/7.0.0

Author: buenaflor

.run/iosApp-spm.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="iosApp-spm" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="0EA1F63A-00BC-4AFB-BB1E-B1970A6F8CB0" XCODE_PROJECT="$PROJECT_DIR$/sentry-samples/kmp-app-spm/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
+  <configuration default="false" name="iosApp-spm" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="27607109-90E2-4A98-8165-C0FF206F6E6D" XCODE_PROJECT="$PROJECT_DIR$/sentry-samples/kmp-app-spm/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
     <method v="2">
       <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
     </method>

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Dependencies
 
+- Bump Cocoa SDK from v8.4.0 to v8.17.1 ([#158](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/158))
+    - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8171)
+    - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.4.0...8.17.1)
 - Bump Kotlin version from v1.8.0 to v1.9.21 ([#146](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/146))
 
 ### Features

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.4.0"
+        val sentryCocoaVersion = "8.17.1"
         val sentryCocoa = "Sentry"
 
         object Samples {

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.4.0'
+    spec.dependency 'Sentry', '8.17.1'
 
     if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework')
         raise "

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

@@ -14,7 +14,6 @@
 
 package io.sentry.kotlin.multiplatform.nsexception
 
-import NSException.Sentry.NSExceptionKt_SentryCrashStackCursorCleanup
 import NSException.Sentry.NSExceptionKt_SentryCrashStackCursorFromNSException
 import NSException.Sentry.NSExceptionKt_SentryMechanismSetNotHandled
 import NSException.Sentry.NSExceptionKt_SentryThreadSetCrashed
@@ -115,7 +114,6 @@ private fun NSException.asSentryException(
     stacktrace = threadInspector?.stacktraceBuilder?.let { stacktraceBuilder ->
         val cursor = NSExceptionKt_SentryCrashStackCursorFromNSException(this@asSentryException)
         val stacktrace = stacktraceBuilder.retrieveStacktraceFromCursor(cursor)
-        NSExceptionKt_SentryCrashStackCursorCleanup(cursor)
         stacktrace
     }
 }

sentry-kotlin-multiplatform/src/nativeInterop/cinterop/SentryNSException/Private/SentryCrashMonitor_NSException+NSExceptionKt.h

@@ -30,7 +30,3 @@ SentryCrashStackCursor NSExceptionKt_SentryCrashStackCursorFromNSException(NSExc
     sentrycrashsc_initWithBacktrace(&cursor, callstack, (int)numFrames, 0);
     return cursor;
 }
-
-void NSExceptionKt_SentryCrashStackCursorCleanup(SentryCrashStackCursor cursor) {
-    sentrycrash_async_backtrace_decref(cursor.async_caller);
-}

sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
-  - Sentry (8.4.0):
-    - Sentry/Core (= 8.4.0)
-    - SentryPrivate (= 8.4.0)
-  - Sentry/Core (8.4.0):
-    - SentryPrivate (= 8.4.0)
-  - SentryPrivate (8.4.0)
+  - Sentry (8.17.1):
+    - Sentry/Core (= 8.17.1)
+    - SentryPrivate (= 8.17.1)
+  - Sentry/Core (8.17.1):
+    - SentryPrivate (= 8.17.1)
+  - SentryPrivate (8.17.1)
   - shared (1.0):
-    - Sentry (~> 8.4.0)
+    - Sentry (= 8.17.1)
 
 DEPENDENCIES:
   - shared (from `../shared`)
@@ -21,9 +21,9 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  Sentry: 16d46dd5ca10e7f4469a2611805a3de123188add
-  SentryPrivate: 2bb4f8d9ff558b25ac70b66c1dedc58a7c43630b
-  shared: d37be71558369434a00872610da90714f79a1fb3
+  Sentry: d9f99f9cc13777c5d938650c1e1c85047bb4f0d1
+  SentryPrivate: 839b1e58addf58624087a80b2628e543193fa8ef
+  shared: 0feb26c3a0ba09396b373b6b7595521635bc0e72
 
 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
 

sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts

@@ -26,7 +26,7 @@ kotlin {
         ios.deploymentTarget = "14.1"
         podfile = project.file("../iosApp/Podfile")
 
-        pod("Sentry", "~> 8.4.0")
+        pod("Sentry", Config.Libs.sentryCocoaVersion)
 
         framework {
             baseName = "shared"

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.4.0'
+    spec.dependency 'Sentry', '8.17.1'
 
     if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
         raise "

sentry-samples/kmp-app-spm/iosApp.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -421,7 +421,7 @@
 			repositoryURL = "https://github.com/getsentry/sentry-cocoa.git";
 			requirement = {
 				kind = exactVersion;
-				version = 8.4.0;
+				version = 8.17.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */