From fc907dd17c13ea6363e58fc92edeea99b980befb Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 8 Oct 2026 03:05:16 +0000 Subject: [PATCH 1/3] chore: update modules/sentry-cocoa to 9.30.1 --- CHANGELOG.md | 8 ++++++++ modules/sentry-cocoa | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0b5b876b..edcda808e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Cocoa SDK from v9.29.0 to v9.30.1 ([#2875](https://github.com/getsentry/sentry-unity/pull/2875)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9301) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.29.0...9.30.1) + ## 4.10.3 ### Fixes diff --git a/modules/sentry-cocoa b/modules/sentry-cocoa index d9df1c4e8..4f135c52a 160000 --- a/modules/sentry-cocoa +++ b/modules/sentry-cocoa @@ -1 +1 @@ -Subproject commit d9df1c4e8d8466c7f8b3c56150378927dadf1b8e +Subproject commit 4f135c52afeeb1d6937eb93824c7ec1cddcaa372 From b968a1fb9203d2536d1a90e6018467d5965a9d24 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 12 Oct 2026 13:55:31 +0200 Subject: [PATCH 2/3] modified the build-cococa-sdk script --- scripts/build-cocoa-sdk.ps1 | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/scripts/build-cocoa-sdk.ps1 b/scripts/build-cocoa-sdk.ps1 index 02fa4dfdc..b1e29d6b6 100644 --- a/scripts/build-cocoa-sdk.ps1 +++ b/scripts/build-cocoa-sdk.ps1 @@ -22,14 +22,22 @@ if (-not (Test-Path (Join-Path $CocoaRoot "Sentry.xcodeproj"))) { exit 1 } -# All build artifacts go under XCFrameworkBuildPath/ which is already in sentry-cocoa's .gitignore. -$buildPath = Join-Path $CocoaRoot "XCFrameworkBuildPath" +# Build artifacts must live outside the package root so file writes avoid triggering packager resolving +# Keyed by the sentry-cocoa commit so re-runs reuse the xcframeworks and submodule bumps rebuild. +$cachePath = Join-Path (Split-Path $PSScriptRoot -Parent) "temp/sentry-cocoa" +$cocoaCommit = git -C $CocoaRoot rev-parse HEAD +$buildPath = Join-Path $cachePath $cocoaCommit $iOSXcframeworkPath = Join-Path $buildPath "SentryObjC-Dynamic-iOS.xcframework" $macOSXcframeworkPath = Join-Path $buildPath "SentryObjC-Dynamic-macOS.xcframework" -if ($Clean -and (Test-Path $buildPath)) { - Write-Host "Clean build requested — removing $buildPath" -ForegroundColor Yellow - Remove-Item -Path $buildPath -Recurse -Force +if ($Clean -and (Test-Path $cachePath)) { + Write-Host "Clean build requested — removing $cachePath" -ForegroundColor Yellow + Remove-Item -Path $cachePath -Recurse -Force +} + +# Prune builds of other sentry-cocoa commits +if (Test-Path $cachePath) { + Get-ChildItem -Path $cachePath -Directory | Where-Object { $_.Name -ne $cocoaCommit } | Remove-Item -Recurse -Force } Write-Host "Building Cocoa SDK from source..." -ForegroundColor Yellow @@ -44,15 +52,10 @@ try { # (SentryObjC + SentryObjCCompat + SentryObjCInternal) into a single self-contained framework, # so Unity links/dlopens only one binary. The dynamic slices are arm64-only (no arm64e), so no # architecture stripping is needed — unlike the main `Sentry` scheme's Xcode-project build. - & ./scripts/build-xcframework-sentryobjc.sh --sdks "iphoneos,iphonesimulator" --variant dynamic + & ./scripts/build-xcframework-sentryobjc.sh --sdks "iphoneos,iphonesimulator" --variant dynamic --output-dir $buildPath & ./scripts/validate-xcframework-format.sh --xcframework "SentryObjC-Dynamic.xcframework" # build-xcframework-sentryobjc.sh outputs to the working directory — move into our build cache Move-Item -Path "SentryObjC-Dynamic.xcframework" -Destination $iOSXcframeworkPath -Force - # Clean up intermediate archives, keep the final xcframework - $archivePath = Join-Path $buildPath "archive" - if (Test-Path $archivePath) { - Remove-Item -Path $archivePath -Recurse -Force - } } $privacyManifest = Join-Path $CocoaRoot "Sources/Resources/PrivacyInfo.xcprivacy" @@ -99,16 +102,9 @@ try { if (-not (Test-Path $macOSXcframeworkPath)) { Write-Host "Building macOS xcframework..." -ForegroundColor Yellow - & ./scripts/build-xcframework-sentryobjc.sh --sdks "macosx" --variant dynamic + & ./scripts/build-xcframework-sentryobjc.sh --sdks "macosx" --variant dynamic --output-dir $buildPath & ./scripts/validate-xcframework-format.sh --xcframework "SentryObjC-Dynamic.xcframework" Move-Item -Path "SentryObjC-Dynamic.xcframework" -Destination $macOSXcframeworkPath -Force - # Clean up all remaining build intermediates - foreach ($dir in @("archive", "DerivedData")) { - $dirPath = Join-Path $buildPath $dir - if (Test-Path $dirPath) { - Remove-Item -Path $dirPath -Recurse -Force - } - } } Write-Host "Setting up macOS support..." -ForegroundColor Yellow From 64b2bcd218b1c9fc5ea3b7629b080fd31aaea8de Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 12 Oct 2026 13:56:36 +0200 Subject: [PATCH 3/3] build --- build/native-sdks.targets | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/build/native-sdks.targets b/build/native-sdks.targets index c095e81b3..cc69718b8 100644 --- a/build/native-sdks.targets +++ b/build/native-sdks.targets @@ -29,22 +29,15 @@ - + - - - - - - - +