From 930f76002b9d64a4abaed6de52fd8bb02c129c24 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 10 May 2023 03:00:58 +0000
Subject: [PATCH 1/3] chore: update modules/sentry-cocoa to 8.7.0

---
 CHANGELOG.md         | 8 ++++++++
 modules/sentry-cocoa | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9b8943b9e..b5805fa5fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Unreleased
+
+### Dependencies
+
+- Bump Cocoa SDK from v8.6.0 to v8.7.0 ([#2359](https://github.com/getsentry/sentry-dotnet/pull/2359))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#870)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.6.0...8.7.0)
+
 ## 3.31.0
 
 ### Features
diff --git a/modules/sentry-cocoa b/modules/sentry-cocoa
index e6dcfba32f..8da8166d3e 160000
--- a/modules/sentry-cocoa
+++ b/modules/sentry-cocoa
@@ -1 +1 @@
-Subproject commit e6dcfba32f2861438b82c7ad34e058b23c83daf6
+Subproject commit 8da8166d3ee068228849f6e4ed93a99d1c4eadc0

From 7d71aff7af09b37891467cd4b5d4ccf5b07f2ab6 Mon Sep 17 00:00:00 2001
From: Matt Johnson-Pint <matt.johnson-pint@sentry.io>
Date: Wed, 10 May 2023 13:00:35 -0700
Subject: [PATCH 2/3] Update ApiDefinitions.cs

---
 src/Sentry.Bindings.Cocoa/ApiDefinitions.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Sentry.Bindings.Cocoa/ApiDefinitions.cs b/src/Sentry.Bindings.Cocoa/ApiDefinitions.cs
index 25f1836df7..81b980ca44 100644
--- a/src/Sentry.Bindings.Cocoa/ApiDefinitions.cs
+++ b/src/Sentry.Bindings.Cocoa/ApiDefinitions.cs
@@ -712,10 +712,6 @@ interface SentryOptions
     [Export ("attachStacktrace")]
     bool AttachStacktrace { get; set; }
 
-    // @property (assign, nonatomic) BOOL stitchAsyncCode;
-    [Export ("stitchAsyncCode")]
-    bool StitchAsyncCode { get; set; }
-
     // @property (assign, nonatomic) NSUInteger maxAttachmentSize;
     [Export ("maxAttachmentSize")]
     nuint MaxAttachmentSize { get; set; }
@@ -728,6 +724,10 @@ interface SentryOptions
     [Export ("enableAutoPerformanceTracing")]
     bool EnableAutoPerformanceTracing { get; set; }
 
+    // @property (nonatomic) SentryScope * _Nonnull (^ _Nonnull)(SentryScope * _Nonnull) initialScope;
+    [Export ("initialScope", ArgumentSemantic.Assign)]
+    Func<SentryScope, SentryScope> InitialScope { get; set; }
+
     // @property (assign, nonatomic) BOOL enableUIViewControllerTracing;
     [Export ("enableUIViewControllerTracing")]
     bool EnableUIViewControllerTracing { get; set; }

From 4212c983382b8ac0fa4126d76825ff522aa85ba5 Mon Sep 17 00:00:00 2001
From: Matt Johnson-Pint <matt.johnson-pint@sentry.io>
Date: Wed, 10 May 2023 14:12:35 -0700
Subject: [PATCH 3/3] Obsolete StitchAsyncCode

---
 src/Sentry/Platforms/iOS/SentryOptions.cs | 10 +++-------
 src/Sentry/Platforms/iOS/SentrySdk.cs     |  4 +++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Sentry/Platforms/iOS/SentryOptions.cs b/src/Sentry/Platforms/iOS/SentryOptions.cs
index 25dc471223..f1f51a7c94 100644
--- a/src/Sentry/Platforms/iOS/SentryOptions.cs
+++ b/src/Sentry/Platforms/iOS/SentryOptions.cs
@@ -253,16 +253,12 @@ public bool EnableUIViewControllerTracking
         public bool EnableUserInteractionTracing { get; set; } = false;
 
         /// <summary>
-        /// This feature is experimental.
-        /// Turning this feature on can have an impact on the grouping of your issues.
-        /// When enabled, the Cocoa SDK stitches stack traces of asynchronous code together.
-        /// This feature affects stack traces from native crashes only.
-        /// The default value is <c>false</c> (disabled).
+        /// This feature is no longer available.  This option does nothing and will be removed in a future release.
         /// </summary>
         /// <remarks>
-        /// Official docs TBD.
-        /// See https://github.com/getsentry/sentry-docs/issues/5215
+        /// This was removed from the Cocoa SDK in 8.6.0 with https://github.com/getsentry/sentry-cocoa/pull/2973
         /// </remarks>
+        [Obsolete("This feature is no longer available.  This option does nothing and will be removed in a future release.")]
         public bool StitchAsyncCode { get; set; } = false;
 
         // /// <summary>
diff --git a/src/Sentry/Platforms/iOS/SentrySdk.cs b/src/Sentry/Platforms/iOS/SentrySdk.cs
index 79eef5cfa3..1bb2a8caf3 100644
--- a/src/Sentry/Platforms/iOS/SentrySdk.cs
+++ b/src/Sentry/Platforms/iOS/SentrySdk.cs
@@ -124,9 +124,11 @@ private static void InitSentryCocoaSdk(SentryOptions options)
         cocoaOptions.EnableSwizzling = options.iOS.EnableSwizzling;
         cocoaOptions.EnableUIViewControllerTracing = options.iOS.EnableUIViewControllerTracing;
         cocoaOptions.EnableUserInteractionTracing = options.iOS.EnableUserInteractionTracing;
-        cocoaOptions.StitchAsyncCode = options.iOS.StitchAsyncCode;
         cocoaOptions.UrlSessionDelegate = options.iOS.UrlSessionDelegate;
 
+        // StitchAsyncCode removed from Cocoa SDK in 8.6.0 with https://github.com/getsentry/sentry-cocoa/pull/2973
+        // cocoaOptions.StitchAsyncCode = options.iOS.StitchAsyncCode;
+
         // In-App Excludes and Includes to be passed to the Cocoa SDK
         options.iOS.InAppExcludes?.ForEach(x => cocoaOptions.AddInAppExclude(x));
         options.iOS.InAppIncludes?.ForEach(x => cocoaOptions.AddInAppInclude(x));