From f22d505a43ceac3e0e944fe702df5d01b864b56d Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 1 May 2026 04:19:57 +0000 Subject: [PATCH 1/2] chore: update modules/sentry-cocoa to 9.12.0 --- CHANGELOG.md | 8 ++++++++ modules/sentry-cocoa | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41d5b2c23..39f9b04f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Cocoa SDK from v9.8.0 to v9.12.0 ([#2658](https://github.com/getsentry/sentry-unity/pull/2658)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9120) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.8.0...9.12.0) + ## 4.3.0 ### Dependencies diff --git a/modules/sentry-cocoa b/modules/sentry-cocoa index 05d3ce833..0baded16c 160000 --- a/modules/sentry-cocoa +++ b/modules/sentry-cocoa @@ -1 +1 @@ -Subproject commit 05d3ce8332097ff0b2347231ac66476fd7d2f4d8 +Subproject commit 0baded16c4bd1f2471949e89bf36289ca2b93080 From cd0b28dbc9ecccd633ab24726692d8c4198bf394 Mon Sep 17 00:00:00 2001 From: Stefan Jandl Date: Tue, 5 May 2026 14:51:27 +0200 Subject: [PATCH 2/2] Apply suggestions from code review merge fail Co-authored-by: Stefan Jandl --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4baa7ba46..3cdef4615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,12 @@ ### Dependencies -<<<<<<< deps/modules/sentry-cocoa/9.12.0 - Bump Cocoa SDK from v9.8.0 to v9.12.0 ([#2658](https://github.com/getsentry/sentry-unity/pull/2658)) - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9120) - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.8.0...9.12.0) -======= - Bump CLI from v3.3.5 to v3.4.1 ([#2656](https://github.com/getsentry/sentry-unity/pull/2656)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#341) - [diff](https://github.com/getsentry/sentry-cli/compare/3.3.5...3.4.1) ->>>>>>> main ## 4.3.0