Skip to content

Commit a0b61aa

Browse files
committed
merge main into the current branch
2 parents 675f8cd + 13f249b commit a0b61aa

13 files changed

+75
-277
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ scripts
107107
#xcodebuild log
108108
xcodebuild.log
109109

110+
Package.resolved

Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# 11.3.0-beta
2-
[added] Initial public beta release of the SDK. For more information visit [Firebase Data Connect](https://firebase.google.com/products/data-connect)
2+
[added] Initial public preview (pre-announced) release of the SDK. For more information visit [Firebase Data Connect](https://firebase.google.com/products/data-connect)
33

Package.resolved

Lines changed: 0 additions & 221 deletions
This file was deleted.

Sources/BaseOperationRef.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
import Foundation
1616

1717
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
18-
public struct OperationResult<ResultData: Decodable> {
18+
public struct OperationResult<ResultData: Decodable & Sendable>: Sendable {
1919
public var data: ResultData
2020
}
2121

2222
// notional protocol that denotes a variable.
2323
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
24-
public protocol OperationVariable: Encodable, Hashable, Equatable {}
24+
public protocol OperationVariable: Encodable, Hashable, Equatable, Sendable {}
2525

2626
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
27-
protocol OperationRequest: Hashable, Equatable {
27+
protocol OperationRequest: Hashable, Equatable, Sendable {
2828
associatedtype Variable: OperationVariable
2929
var operationName: String { get } // Name within Connector definition
3030
var variables: Variable? { get }
3131
}
3232

3333
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
3434
public protocol OperationRef {
35-
associatedtype ResultData: Decodable
35+
associatedtype ResultData: Decodable & Sendable
3636

3737
func execute() async throws -> OperationResult<ResultData>
3838
}

Sources/ConnectorConfig.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import Foundation
1616

1717
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
18-
public struct ConnectorConfig: Hashable, Equatable {
18+
public struct ConnectorConfig: Hashable, Equatable, Sendable {
1919
public private(set) var serviceId: String
2020
public private(set) var location: String
2121
public private(set) var connector: String

0 commit comments

Comments
 (0)