Merge branch 'main' into logging-and-more-cleanup

vapor · Jan 30, 2024 · bbb5087 · bbb5087
2 parents d26f984 + 6ce96ab
commit bbb5087
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Sources/ConnectionPoolModule/ConnectionPool.swift b/Sources/ConnectionPoolModule/ConnectionPool.swift
@@ -591,7 +591,7 @@ protocol TaskGroupProtocol {
 }
 
 #if swift(>=5.8) && os(Linux) || swift(>=5.9)
-@available(macOS 14.0, iOS 17.0, tvOS 17.0, watchOS 9.0, *)
+@available(macOS 14.0, iOS 17.0, tvOS 17.0, watchOS 10.0, *)
 extension DiscardingTaskGroup: TaskGroupProtocol {}
 #endif
 

diff --git a/Sources/PostgresNIO/New/PostgresCodable.swift b/Sources/PostgresNIO/New/PostgresCodable.swift
@@ -166,11 +166,10 @@ extension PostgresDynamicTypeEncodable {
 
 /// A context that is passed to Swift objects that are encoded into the Postgres wire format. Used
 /// to pass further information to the encoding method.
-public struct PostgresEncodingContext<JSONEncoder: PostgresJSONEncoder> {
+public struct PostgresEncodingContext<JSONEncoder: PostgresJSONEncoder>: Sendable {
     /// A ``PostgresJSONEncoder`` used to encode the object to json.
     public var jsonEncoder: JSONEncoder
 
-
     /// Creates a ``PostgresEncodingContext`` with the given ``PostgresJSONEncoder``. In case you want
     /// to use the a ``PostgresEncodingContext`` with an unconfigured Foundation `JSONEncoder`
     /// you can use the ``default`` context instead.