chore(deps): update Cocoa SDK to v8.33.0 (#3528)

.github/actions/buildnative/action.yml

@@ -7,7 +7,12 @@ runs:
 
     - name: Set Environment Variables
       shell: bash
-      run: echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+      run: |
+        if [[ "$RUNNER_OS" == "macOS" ]]; then
+          echo "JAVA_HOME_11=$JAVA_HOME_11_ARM64" >> $GITHUB_ENV
+        else
+          echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+        fi
 
     - uses: actions/cache@v3
       id: cache-c

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
       - "**.md"
 
 env:
-  XCODE_VERSION: 15.1
+  XCODE_VERSION: 15.4
 
 jobs:
   build-sentry-native:
@@ -52,8 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Pinning `macos-13` because Microsoft.iOS 16.4 requires Xcode 14.3 which is only built-in in 13
-        os: [ubuntu-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Cancel Previous Runs
@@ -106,15 +105,11 @@ jobs:
         if: runner.os == 'macOS'
         uses: ./.github/actions/buildcocoasdk
 
-      # Only switch to newer xcode after building the Cocoa SDK so that it can keep IPHONEOS_DEPLOYMENT_TARGET=11.0
-      - run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app
-        if: runner.os == 'macOS'
-
       - name: Restore .NET Dependencies
         run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
 
       - name: Build
-        run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -flp:logfile=build.log -p:CopyLocalLockFileAssemblies=true
+        run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -v:diagnostic -flp:logfile=build.log -p:CopyLocalLockFileAssemblies=true
 
       - name: Test
         run: dotnet test Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}" --collect "XPlat Code Coverage"
@@ -153,7 +148,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v4
@@ -175,9 +170,6 @@ jobs:
           sudo apt update
           sudo apt install libcurl4-openssl-dev
 
-      - run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app
-        if: runner.os == 'macOS'
-
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x

CHANGELOG.md

@@ -23,9 +23,9 @@ Unable to load DLL sentry-native or one of its dependencies
 - Bump Java SDK from v7.11.0 to v7.12.1 ([#3503](https://github.com/getsentry/sentry-dotnet/pull/3503))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7121)
   - [diff](https://github.com/getsentry/sentry-java/compare/7.11.0...7.12.1)
-- Bump Cocoa SDK from v8.30.0 to v8.32.0 ([#3499](https://github.com/getsentry/sentry-dotnet/pull/3499))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8320)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.30.0...8.32.0)
+- Bump Cocoa SDK from v8.30.0 to v8.33.0 ([#3499](https://github.com/getsentry/sentry-dotnet/pull/3499), [#3528](https://github.com/getsentry/sentry-dotnet/pull/3528))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8330)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.30.0...8.33.0)
 - Bump Native SDK from v0.7.6 to v0.7.7 ([#3502](https://github.com/getsentry/sentry-dotnet/pull/3502))
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#077)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.7.6...0.7.7)

lib/sentry-android-supplemental/build.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 
 # this should point at JDK 11 (required for Android)
-: ${JAVA_HOME_11:=/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home}
+if [ -z "${JAVA_HOME_11}" ]; then
+    echo "Error: 'JAVA_HOME_11' is not set. Please set 'JAVA_HOME_11' to the path of JDK 11 (required for Android)." >&2
+    exit 1
+fi
 
 echo "Starting Java Build"
 echo "Using Java SDK at $JAVA_HOME_11"

src/Sentry.Bindings.Cocoa/ApiDefinitions.cs

@@ -7,6 +7,7 @@
 using System;
 using Foundation;
 using ObjCRuntime;
+using UIKit;
 
 namespace Sentry.CocoaSdk;
 
@@ -36,6 +37,10 @@ namespace Sentry.CocoaSdk;
 [Internal]
 delegate bool SentryBeforeCaptureScreenshotCallback (SentryEvent @event);
 
+// typedef BOOL (^SentryBeforeCaptureViewHierarchyCallback)(SentryEvent * _Nonnull);
+[Internal]
+delegate bool SentryBeforeCaptureViewHierarchyCallback (SentryEvent @event);
+
 // typedef void (^SentryOnCrashedLastRunCallback)(SentryEvent * _Nonnull);
 [Internal]
 delegate void SentryOnCrashedLastRunCallback (SentryEvent @event);
@@ -1271,6 +1276,10 @@ interface SentryOptions
     [NullAllowed, Export ("beforeCaptureScreenshot", ArgumentSemantic.Copy)]
     SentryBeforeCaptureScreenshotCallback BeforeCaptureScreenshot { get; set; }
 
+    // @property (copy, nonatomic) SentryBeforeCaptureScreenshotCallback _Nullable beforeCaptureViewHierarchy;
+    [NullAllowed, Export ("beforeCaptureViewHierarchy", ArgumentSemantic.Copy)]
+    SentryBeforeCaptureScreenshotCallback BeforeCaptureViewHierarchy { get; set; }
+
     // @property (copy, nonatomic) SentryOnCrashedLastRunCallback _Nullable onCrashedLastRun;
     [NullAllowed, Export ("onCrashedLastRun", ArgumentSemantic.Copy)]
     SentryOnCrashedLastRunCallback OnCrashedLastRun { get; set; }
@@ -1340,6 +1349,10 @@ interface SentryOptions
     [Export ("attachViewHierarchy")]
     bool AttachViewHierarchy { get; set; }
 
+    // @property (assign, nonatomic) BOOL reportAccessibilityIdentifier;
+    [Export ("reportAccessibilityIdentifier")]
+    bool ReportAccessibilityIdentifier { get; set; }
+
     // @property (assign, nonatomic) BOOL enableUserInteractionTracing;
     [Export ("enableUserInteractionTracing")]
     bool EnableUserInteractionTracing { get; set; }
@@ -1727,6 +1740,16 @@ interface SentrySDK
     [Static]
     [Export ("close")]
     void Close ();
+
+    // +(void)replayRedactView:(UIView * _Nonnull)view;
+    [Static]
+    [Export ("replayRedactView:")]
+    void ReplayRedactView (UIView view);
+
+    // +(void)replayIgnoreView:(UIView * _Nonnull)view;
+    [Static]
+    [Export ("replayIgnoreView:")]
+    void ReplayIgnoreView (UIView view);
 }
 
 // @interface SentrySamplingContext : NSObject