Update bindings for Cocoa SDK v9

CHANGELOG.md

@@ -14,6 +14,9 @@
 - Bump Java SDK from v8.28.0 to v8.29.0 ([#4817](https://github.com/getsentry/sentry-dotnet/pull/4817))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8290)
   - [diff](https://github.com/getsentry/sentry-java/compare/8.28.0...8.29.0)
+- Bump Cocoa SDK from v8.57.3 to v9.2.0 ([#4781](https://github.com/getsentry/sentry-dotnet/pull/4781))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#920)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.3...9.2.0)
 
 ## 6.0.0
 

modules/sentry-cocoa.properties

@@ -1,2 +1,2 @@
-version = 8.57.3
+version = 9.2.0
 repo = https://github.com/getsentry/sentry-cocoa

scripts/generate-cocoa-bindings.ps1

@@ -132,7 +132,7 @@ foreach ($file in $filesToPatch)
         Write-Host "File not found: $file"
     }
 }
-$privateHeaderFile = "$PrivateHeadersPath/PrivatesHeader.h"
+$privateHeaderFile = "$HeadersPath/PrivatesHeader.h"
 if (Test-Path $privateHeaderFile)
 {
     $content = Get-Content -Path $privateHeaderFile -Raw
@@ -169,7 +169,7 @@ sharpie bind -sdk $iPhoneSdkVersion `
     -scope "$CocoaSdkPath" `
     "$HeadersPath/Sentry.h" `
     "$HeadersPath/Sentry-Swift.h" `
-    "$PrivateHeadersPath/PrivateSentrySDKOnly.h" `
+    "$HeadersPath/PrivateSentrySDKOnly.h" `
     -o $BindingsPath `
     -c -Wno-objc-property-no-attribute `
     -F"$iPhoneSdkPath/System/Library/SubFrameworks" # needed for UIUtilities.framework in Xcode 26+

scripts/patch-cocoa-bindings.cs

@@ -72,6 +72,10 @@
     .WithAttribute("SentryBeforeBreadcrumbCallback", "return: NullAllowed")
     .WithAttribute("SentryBeforeSendEventCallback", "return: NullAllowed")
     .WithAttribute("SentryTracesSamplerCallback", "return: NullAllowed")
+    // Fix nullable return attributes
+    .RemoveAttribute("PrivateSentrySDKOnly", "Capture*", "NullAllowed")
+    .WithAttribute("PrivateSentrySDKOnly", "CaptureScreenshots", "return: NullAllowed")
+    .WithAttribute("PrivateSentrySDKOnly", "CaptureViewHierarchies", "return: NullAllowed")
     // For PrivateApiDefinitions.cs
     .WithModifier("SentryScope", "partial")
     // error CS0246: The type or namespace name 'iOS' could not be found
@@ -84,24 +88,28 @@
     .RemoveMethod("Sentry*", "IsEqual")
     // error CS0246: The type or namespace name '_NSZone' could not be found
     .RemoveMethod("Sentry*", "CopyWithZone")
+    // error CS0111: Type 'SentryAttribute' already defines a member called 'Constructor' with the same parameter types
+    .RemoveMethod("SentryLog", "SetAttribute")
     // SentryEnvelope* is not whitelisted
     .RemoveMethod("PrivateSentrySDKOnly", "CaptureEnvelope")
     .RemoveMethod("PrivateSentrySDKOnly", "EnvelopeWithData")
     .RemoveMethod("PrivateSentrySDKOnly", "StoreEnvelope")
-    // deprecated
-    .RemoveMethod("Sentry*", "CaptureUserFeedback")
+    // SentryLoggerDelegate and SentryCurrentDateProvider are not whitelisted
+    .RemoveMethod("SentryLogger", "Constructor")
     // SentryAppStartMeasurement is not whitelisted
     .RemoveDelegate("SentryOnAppStartMeasurementAvailable")
-    // deprecated
+    // unused
     .RemoveDelegate("SentryUserFeedbackConfigurationBlock")
     // error CS0114: 'SentryXxx.Description' hides inherited member 'NSObject.Description'.
     .RemoveProperty("Sentry*", "Description")
     // SentryAppStartMeasurement is not whitelisted
     .RemoveProperty("PrivateSentrySDKOnly", "*AppStartMeasurement*")
-    // SentryStructuredLogAttribute is not whitelisted
-    .RemoveProperty("SentryLog", "Attributes")
-    // deprecated
+    // Minimize SentryDependencyContainer
+    .RemoveMethod("SentryDependencyContainer", "*")
+    .KeepProperties("SentryDependencyContainer", "SharedInstance", "DebugImageProvider")
+    // SentryUserFeedbackConfiguration is not whitelisted
     .RemoveProperty("SentryOptions", "ConfigureUserFeedback")
+    .RemoveProperty("SentryOptions", "UserFeedbackConfiguration")
     .KeepInterfaces(
         "ISentryRRWebEvent",
         "PrivateSentrySDKOnly",
@@ -111,6 +119,7 @@
         "SentryClient",
         "SentryDebugImageProvider",
         "SentryDebugMeta",
+        "SentryDependencyContainer",
         "SentryDsn",
         "SentryEvent",
         "SentryException",
@@ -129,6 +138,7 @@
         "SentryMeasurementUnitFraction",
         "SentryMeasurementUnitInformation",
         "SentryMechanism",
+        "SentryMechanismContext",
         "SentryMechanismMeta",
         "SentryMessage",
         "SentryNSError",
@@ -159,7 +169,9 @@
     )
     // Rename and retarget the experimental options property
     .RenameProperty("SentryOptions", "_swiftExperimentalOptions", "Experimental")
-    .ChangePropertyType("SentryOptions", "Experimental", "SentryExperimentalOptions");
+    .ChangePropertyType("SentryOptions", "Experimental", "SentryExperimentalOptions")
+    // error CS0311: The type 'SentryXxx' cannot be used as type parameter 'TValue' in the generic type or method 'NSDictionary<TKey, TValue>'.
+    .ChangeGenericTypeArgument("NSDictionary", "Sentry*", "NSObject");
 
 var formatted = CodeFormatter.Format(nodes, new AdhocWorkspace());
 File.WriteAllText(args[0], formatted.ToFullString() + "\n");
@@ -219,6 +231,19 @@ public static CompilationUnitSyntax RemoveAttribute(
             .RemoveByPredicate<AttributeListSyntax>(node => node.Attributes.Count == 0);
     }
 
+    public static CompilationUnitSyntax RemoveAttribute(
+        this CompilationUnitSyntax root,
+        string type,
+        string name,
+        string attribute)
+    {
+        return root.RemoveByPredicate<AttributeSyntax>(node =>
+            node.Name.Matches(attribute) &&
+            node.Parent?.Parent is MethodDeclarationSyntax method &&
+            method.Identifier.Matches(name) &&
+            method.HasParent(type));
+    }
+
     public static CompilationUnitSyntax RemoveBaseType(
         this CompilationUnitSyntax root,
         string name)
@@ -275,6 +300,18 @@ public static CompilationUnitSyntax WithAttribute(
         return root.ReplaceNodes(nodes, (node, _) => node.WithAttribute(attribute));
     }
 
+    public static CompilationUnitSyntax WithAttribute(
+        this CompilationUnitSyntax root,
+        string type,
+        string name,
+        string attribute)
+    {
+        var nodes = root.DescendantNodes()
+            .OfType<MethodDeclarationSyntax>()
+            .Where(node => node.Identifier.Matches(name) && node.HasParent(type) && !node.HasAttribute(attribute));
+        return root.ReplaceNodes(nodes, (node, _) => node.WithAttribute(attribute));
+    }
+
     public static CompilationUnitSyntax AsInternal(
         this CompilationUnitSyntax root,
         string name,
@@ -417,6 +454,22 @@ public static CompilationUnitSyntax ChangePropertyType(
         return root.ReplaceNodes(nodes, (node, _) => node.WithType(SyntaxFactory.ParseTypeName(newType)));
     }
 
+    public static CompilationUnitSyntax ChangeGenericTypeArgument(
+        this CompilationUnitSyntax root,
+        string type,
+        string from,
+        string to)
+    {
+        var nodes = root.DescendantNodes()
+            .OfType<GenericNameSyntax>()
+            .Where(node => node.Identifier.Matches(type) && node.TypeArgumentList.Arguments.Any(arg => arg.Matches(from)));
+
+        return root.ReplaceNodes(nodes, (node, _) =>
+        {
+            var args = node.TypeArgumentList.Arguments.Select(arg => arg.Matches(from) ? SyntaxFactory.ParseTypeName(to) : arg);
+            return node.WithTypeArgumentList(node.TypeArgumentList.WithArguments(SyntaxFactory.SeparatedList(args)));
+        });
+    }
 }
 
 internal static class SyntaxNodeExtensions