From 4506bdb8b3fe600ffba1f726649f63e0a5fb7943 Mon Sep 17 00:00:00 2001 From: Itay Brenner Date: Wed, 13 Aug 2025 12:19:33 -0300 Subject: [PATCH 1/3] fix: Build error on Xcode 14.2 --- Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift b/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift index e34b763c6e8..adcd14b7071 100644 --- a/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift +++ b/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift @@ -48,9 +48,10 @@ extension SentryFeedback: SentrySerializable { } extension SentryFeedback { #if SDK_V9 - @_spi(Private) - #endif + @_spi(Private) public func serialize() -> [String: Any] { + #else public func serialize() -> [String: Any] { + #endif let numberOfOptionalItems = (name == nil ? 0 : 1) + (email == nil ? 0 : 1) + (associatedEventId == nil ? 0 : 1) var dict = [String: Any](minimumCapacity: 2 + numberOfOptionalItems) dict["message"] = message From 669f02ce7da58c6a84cfe477de8680ce5c97d20d Mon Sep 17 00:00:00 2001 From: Itay Brenner Date: Wed, 13 Aug 2025 12:26:29 -0300 Subject: [PATCH 2/3] Add changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16319e95bd0..fdb11a12aeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,10 @@ - Add a new prebuilt framework with ARM64e for WithoutUIKitOrAppKit (#5897) - Add source context and vars fields to SentryFrame (#5853) +### Fixes + +- Fixed a build error in `SentryFeedback.swift` when building with cocoapods on Xcode 14.2 (#5917) + ## 8.54.1-alpha.1 - No documented changes. From dba4ee897575b3228c8ea5913362af5c6bcb7caf Mon Sep 17 00:00:00 2001 From: Itay Brenner Date: Wed, 13 Aug 2025 13:16:42 -0300 Subject: [PATCH 3/3] Refactor SentryFeedback serialization to have 2 declarations depending if SDKv9 is enabled or not --- .../Swift/Integrations/UserFeedback/SentryFeedback.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift b/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift index adcd14b7071..c22eb600c02 100644 --- a/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift +++ b/Sources/Swift/Integrations/UserFeedback/SentryFeedback.swift @@ -49,9 +49,15 @@ extension SentryFeedback: SentrySerializable { } extension SentryFeedback { #if SDK_V9 @_spi(Private) public func serialize() -> [String: Any] { + return internalSerialize() + } #else public func serialize() -> [String: Any] { + return internalSerialize() + } #endif + + private func internalSerialize() -> [String: Any] { let numberOfOptionalItems = (name == nil ? 0 : 1) + (email == nil ? 0 : 1) + (associatedEventId == nil ? 0 : 1) var dict = [String: Any](minimumCapacity: 2 + numberOfOptionalItems) dict["message"] = message