Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

### Dependencies

- Reapply "Bump Cocoa SDK from v8.39.0 to v8.46.0 (#4103)" ([#4442](https://github.com/getsentry/sentry-dotnet/pull/4442))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8460)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.39.0...8.46.0)
- Bump sentry-cocoa from 8.39.0 to 8.55.1 ([#4442](https://github.com/getsentry/sentry-dotnet/pull/4442), [#4483](https://github.com/getsentry/sentry-dotnet/pull/4483), [#4485](https://github.com/getsentry/sentry-dotnet/pull/4485))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8551)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.39.0...8.55.1)
- Bump Native SDK from v0.9.1 to v0.10.1 ([#4436](https://github.com/getsentry/sentry-dotnet/pull/4436), [#4492](https://github.com/getsentry/sentry-dotnet/pull/4492))
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0101)
- [diff](https://github.com/getsentry/sentry-native/compare/0.9.1...0.10.1)
Expand Down
2 changes: 1 addition & 1 deletion modules/sentry-cocoa.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = 8.53.2
version = 8.55.1
repo = https://github.com/getsentry/sentry-cocoa
15 changes: 10 additions & 5 deletions scripts/generate-cocoa-bindings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ if (!(Test-Path '/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/
# Verify checksum
Write-Output "Verifying package checksum..."
$actualSha256 = (Get-FileHash -Path $downloadPath -Algorithm SHA256).Hash.ToLower()

if ($actualSha256 -ne $expectedSha256)
{
Write-Error "Checksum verification failed. Expected: $expectedSha256, Actual: $actualSha256"
Remove-Item $downloadPath -Force -ErrorAction SilentlyContinue
exit 1
}

Write-Output "Checksum verification passed."

if (Test-Path $downloadPath)
Expand Down Expand Up @@ -108,7 +108,7 @@ foreach ($file in $filesToPatch)
{
$content = Get-Content -Path $file -Raw
$content = $content -replace '<Sentry/([^>]+)>', '"$1"'
$content = $content -replace '#import SENTRY_HEADER\(([^)]+)\)', '#import "$1.h"'
$content = $content -replace '#\s*import SENTRY_HEADER\(([^)]+)\)', '#import "$1.h"'
Set-Content -Path $file -Value $content
}
else
Expand Down Expand Up @@ -209,7 +209,10 @@ $Text = $Text -replace '\bISentrySerializable\b', 'SentrySerializable'
$Text = $Text -replace ': INSCopying,', ':' -replace '\s?[:,] INSCopying', ''

# Remove iOS attributes like [iOS (13, 0)]
$Text = $Text -replace '\[iOS \(13,\s?0\)\]\n?', ''
$Text = $Text -replace '\[iOS \(13,\s?0\)\]\n?\s*', ''

# Remove Unavailable attributes like [Unavailable (PlatformName.iOSAppExtension)]
$Text = $Text -replace '\[Unavailable \(PlatformName\.\w+\)\]\n?\s*', ''

# Fix delegate argument names
$Text = $Text -replace '(NSError) arg\d', '$1 error'
Expand All @@ -219,6 +222,7 @@ $Text = $Text -replace '(SentrySamplingContext) arg\d', '$1 samplingContext'
$Text = $Text -replace '(SentryBreadcrumb) arg\d', '$1 breadcrumb'
$Text = $Text -replace '(SentrySpan) arg\d', '$1 span'
$Text = $Text -replace '(SentryAppStartMeasurement) arg\d', '$1 appStartMeasurement'
$Text = $Text -replace '(SentryLog) arg\d', '$1 log'

# Adjust nullable return delegates (though broken until this is fixed: https://github.com/xamarin/xamarin-macios/issues/17109)
$Text = $Text -replace 'delegate \w+ Sentry(BeforeBreadcrumb|BeforeSendEvent|TracesSampler)Callback', "[return: NullAllowed]`n$&"
Expand Down Expand Up @@ -259,8 +263,9 @@ $Text = $Text -replace '\[Verify \(MethodToProperty\)\]\n\s*(.+) \{ get; \}', '$
# We have some that accept either NSString or NSRegularExpression, which have no common type so they use NSObject
$Text = $Text -replace '\s*\[Verify \(StronglyTypedNSArray\)\]\n', ''

# Fix broken line comment
# Fix broken multi-line comments
$Text = $Text -replace '(DEPRECATED_MSG_ATTRIBUTE\()\n\s*', '$1'
$Text = $Text -replace '(DEPRECATED_MSG_ATTRIBUTE\([^)]*?)"\s*\r?\n\s*"', '$1 '

# Remove default IsEqual implementation (already implemented by NSObject)
$Text = $Text -replace '(?ms)\n?^ *// [^\n]*isEqual:.*?$.*?;\n', ''
Expand Down
Loading
Loading