Skip to content

Commit 81cce2d

Browse files
authored
Fix an issue where Swift complained that the sent object in transactions could not be passed across actor boundaries (#15467)
1 parent e65a3a0 commit 81cce2d

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Firestore/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22
- [feature] Add `Pipeline` support.
3+
- [fixed] Fixed an issue where the returned object in transaction blocks could not
4+
pass across actor boundaries in Swift 6 (#15467).
35

46
# 12.4.0
57
- [fixed] Implemented an internal workaround to fix

Firestore/Swift/Source/AsyncAwait/Firestore+AsyncAwait.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public extension Firestore {
102102
/// explicitly specified in the `updateBlock` parameter.
103103
/// - Returns Returns the value returned in the `updateBlock` parameter if no errors occurred.
104104
func runTransaction(_ updateBlock: @escaping (Transaction, NSErrorPointer)
105-
-> Any?) async throws -> Any? {
105+
-> sending Any?) async throws -> sending Any? {
106106
// This needs to be wrapped in order to express a nullable return value upon success.
107107
// See https://github.com/firebase/firebase-ios-sdk/issues/9426 for more details.
108108
return try await withCheckedThrowingContinuation { continuation in

Firestore/Swift/Source/Stages.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ import Foundation
2626
protocol Stage {
2727
var name: String { get }
2828
var bridge: StageBridge { get }
29-
/// The `errorMessage` defaults to `nil`. Errors during stage construction are captured and thrown later when `execute()` is called.
29+
/// The `errorMessage` defaults to `nil`. Errors during stage construction are captured and thrown
30+
/// later when `execute()` is called.
3031
var errorMessage: String? { get }
3132
}
3233

0 commit comments

Comments
 (0)