Require Swift 5.6 Compiler for Concurrency Support

groue · groue · commit 209192d3a51d · 2022-04-13T23:07:33.000+02:00
diff --git a/Documentation/Concurrency.md b/Documentation/Concurrency.md
@@ -137,7 +137,7 @@ try dbQueue.write { db in
 <details>
     <summary><b>Swift concurrency</b> (async/await)</summary>
 
-[**:fire: EXPERIMENTAL**](../README.md#what-are-experimental-features) GRDB support for Swift concurrency requires Xcode 13.2+.
+[**:fire: EXPERIMENTAL**](../README.md#what-are-experimental-features) GRDB support for Swift concurrency requires Xcode 13.3.1+.
 
 ```swift
 let playerCount = try await dbQueue.read { db in
diff --git a/GRDB/Core/DatabasePool.swift b/GRDB/Core/DatabasePool.swift
@@ -160,7 +160,7 @@ public final class DatabasePool: DatabaseWriter {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if swift(>=5.6) && canImport(_Concurrency)
 // @unchecked because of databaseSnapshotCount and readerPool
 extension DatabasePool: @unchecked Sendable { }
 #endif
diff --git a/GRDB/Core/DatabaseReader.swift b/GRDB/Core/DatabaseReader.swift
@@ -371,7 +371,7 @@ extension DatabaseReader {
     }
 }
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
 extension DatabaseReader {
     // MARK: - Asynchronous Database Access
     
diff --git a/GRDB/Core/DatabaseValue.swift b/GRDB/Core/DatabaseValue.swift
@@ -159,7 +159,7 @@ extension DatabaseValue: StatementBinding {
 
 extension DatabaseValue: GRDBSendable { }
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if swift(>=5.6) && canImport(_Concurrency)
 // @unchecked due to Foundation.Data not conforming to Sendable
 // TODO: Remove @unchecked when Foundation has been upgraded
 extension DatabaseValue.Storage: @unchecked Sendable { }
diff --git a/GRDB/Core/DatabaseWriter.swift b/GRDB/Core/DatabaseWriter.swift
@@ -380,7 +380,7 @@ extension DatabaseWriter {
     }
 }
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
 extension DatabaseWriter {
     // MARK: - Asynchronous Database Access
     
diff --git a/GRDB/Core/Row.swift b/GRDB/Core/Row.swift
@@ -2182,7 +2182,7 @@ struct ArrayRowImpl: RowImpl {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if swift(>=5.6) && canImport(_Concurrency)
 // @unchecked because columns property is not inferred as Sendable
 // TODO: remove this @unchecked when compiler can handle tuples.
 extension ArrayRowImpl: @unchecked Sendable { }
diff --git a/GRDB/Core/SerializedDatabase.swift b/GRDB/Core/SerializedDatabase.swift
@@ -249,7 +249,7 @@ final class SerializedDatabase {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if swift(>=5.6) && canImport(_Concurrency)
 // @unchecked because the wrapped `Database` itself is not Sendable.
 // It happens the job of SerializedDatabase is precisely to provide thread-safe
 // access to `Database`.
diff --git a/GRDB/Utils/Utils.swift b/GRDB/Utils/Utils.swift
@@ -32,7 +32,7 @@ public protocol _OptionalProtocol {
 /// :nodoc:
 extension Optional: _OptionalProtocol { }
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if swift(>=5.6) && canImport(_Concurrency)
 public typealias GRDBSendable = Swift.Sendable
 #else
 public typealias GRDBSendable = Any
diff --git a/GRDB/ValueObservation/SharedValueObservation.swift b/GRDB/ValueObservation/SharedValueObservation.swift
@@ -299,7 +299,7 @@ public final class SharedValueObservation<Element> {
     }
 }
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
 extension SharedValueObservation {
     // MARK: - Asynchronous Observation
     /// The database observation, as an asynchronous sequence of
diff --git a/GRDB/ValueObservation/ValueObservation.swift b/GRDB/ValueObservation/ValueObservation.swift
@@ -252,7 +252,7 @@ extension ValueObservation: Refinable {
     }
 }
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
 extension ValueObservation {
     // MARK: - Asynchronous Observation
     /// The database observation, as an asynchronous sequence of
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ GRDB ships with:
 - [WAL Mode Support](#database-pools): Extra performance for multi-threaded applications.
 - [Migrations]: Transform your database as your application evolves.
 - [Database Observation]: Observe database changes and transactions.
-- [Swift Concurrency]: `try await` your database (Xcode 13.2+).
+- [Swift Concurrency]: `try await` your database (Xcode 13.3.1+).
 - [Combine Support]: Access and observe the database with Combine publishers.
 - [RxSwift Support](http://github.com/RxSwiftCommunity/RxGRDB): Access and observe the database with RxSwift observables.
 - [Full-Text Search]
diff --git a/Tests/GRDBCombineTests/Support.swift b/Tests/GRDBCombineTests/Support.swift
@@ -51,7 +51,7 @@ final class Test<Context> {
     }
 }
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
 final class AsyncTest<Context> {
     // Raise the repeatCount in order to help spotting flaky tests.
diff --git a/Tests/GRDBTests/DatabaseReaderTests.swift b/Tests/GRDBTests/DatabaseReaderTests.swift
@@ -30,7 +30,7 @@ class DatabaseReaderTests : GRDBTestCase {
         try test(setup(makeDatabasePool()).makeSnapshot())
     }
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_ReadCanRead() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
@@ -68,7 +68,7 @@ class DatabaseReaderTests : GRDBTestCase {
         try test(makeDatabasePool().makeSnapshot())
     }
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_ReadPreventsDatabaseModification() async throws {
         func test(_ dbReader: DatabaseReader) async throws {
@@ -107,7 +107,7 @@ class DatabaseReaderTests : GRDBTestCase {
         try test(setup(makeDatabasePool()).makeSnapshot())
     }
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_UnsafeReadCanRead() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
diff --git a/Tests/GRDBTests/DatabaseWriterTests.swift b/Tests/GRDBTests/DatabaseWriterTests.swift
@@ -266,7 +266,7 @@ class DatabaseWriterTests : GRDBTestCase {
         try DatabaseQueue().backup(to: dbQueue)
     }
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_write() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
@@ -288,7 +288,7 @@ class DatabaseWriterTests : GRDBTestCase {
     }
 #endif
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_writeWithoutTransaction() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
@@ -313,7 +313,7 @@ class DatabaseWriterTests : GRDBTestCase {
     }
 #endif
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_barrierWriteWithoutTransaction() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
@@ -338,7 +338,7 @@ class DatabaseWriterTests : GRDBTestCase {
     }
 #endif
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_erase() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
@@ -358,7 +358,7 @@ class DatabaseWriterTests : GRDBTestCase {
     }
 #endif
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait_vacuum() async throws {
         func setup<T: DatabaseWriter>(_ dbWriter: T) throws -> T {
@@ -376,7 +376,7 @@ class DatabaseWriterTests : GRDBTestCase {
     }
 #endif
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.16, iOS 14, tvOS 14, watchOS 7, *) // async + vacuum into
     func testAsyncAwait_vacuumInto() async throws {
         // Prevent SQLCipher failures
diff --git a/Tests/GRDBTests/GRDBTestCase.swift b/Tests/GRDBTests/GRDBTestCase.swift
@@ -259,7 +259,7 @@ public struct AnyValueReducer<Fetched, Value>: ValueReducer {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
+#if swift(>=5.6) && canImport(_Concurrency)
 // Assume this is correct :-/
 extension XCTestExpectation: @unchecked Sendable { }
 #endif
diff --git a/Tests/GRDBTests/SharedValueObservationTests.swift b/Tests/GRDBTests/SharedValueObservationTests.swift
@@ -621,7 +621,7 @@ class SharedValueObservationTests: GRDBTestCase {
     }
 #endif
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     func testAsyncAwait() async throws {
         let dbQueue = try makeDatabaseQueue()
diff --git a/Tests/GRDBTests/ValueObservationTests.swift b/Tests/GRDBTests/ValueObservationTests.swift
@@ -694,7 +694,7 @@ class ValueObservationTests: GRDBTestCase {
         try test(makeDatabasePool())
     }
     
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+#if compiler(>=5.6) && canImport(_Concurrency)
     // MARK: - Async Await
     
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public final class DatabasePool: DatabaseWriter {`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`-#if swift(>=5.5) && canImport(_Concurrency)`
	`163`	`+#if swift(>=5.6) && canImport(_Concurrency)`
`164`	`164`	`// @unchecked because of databaseSnapshotCount and readerPool`
`165`	`165`	`extension DatabasePool: @unchecked Sendable { }`
`166`	`166`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ extension DatabaseReader {`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`
`374`		`-#if compiler(>=5.5.2) && canImport(_Concurrency)`
	`374`	`+#if compiler(>=5.6) && canImport(_Concurrency)`
`375`	`375`	`extension DatabaseReader {`
`376`	`376`	`// MARK: - Asynchronous Database Access`
`377`	`377`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ extension DatabaseWriter {`
`380`	`380`	`}`
`381`	`381`	`}`
`382`	`382`
`383`		`-#if compiler(>=5.5.2) && canImport(_Concurrency)`
	`383`	`+#if compiler(>=5.6) && canImport(_Concurrency)`
`384`	`384`	`extension DatabaseWriter {`
`385`	`385`	`// MARK: - Asynchronous Database Access`
`386`	`386`
Original file line number	Diff line number	Diff line change
`@@ -2182,7 +2182,7 @@ struct ArrayRowImpl: RowImpl {`
`2182`	`2182`	`}`
`2183`	`2183`	`}`
`2184`	`2184`
`2185`		`-#if swift(>=5.5) && canImport(_Concurrency)`
	`2185`	`+#if swift(>=5.6) && canImport(_Concurrency)`
`2186`	`2186`	`// @unchecked because columns property is not inferred as Sendable`
`2187`	`2187`	`// TODO: remove this @unchecked when compiler can handle tuples.`
`2188`	`2188`	`extension ArrayRowImpl: @unchecked Sendable { }`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ final class SerializedDatabase {`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`252`		`-#if swift(>=5.5) && canImport(_Concurrency)`
	`252`	`+#if swift(>=5.6) && canImport(_Concurrency)`
`253`	`253`	// @unchecked because the wrapped `Database` itself is not Sendable.
`254`	`254`	`// It happens the job of SerializedDatabase is precisely to provide thread-safe`
`255`	`255`	// access to `Database`.
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public final class SharedValueObservation<Element> {`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`
`302`		`-#if compiler(>=5.5.2) && canImport(_Concurrency)`
	`302`	`+#if compiler(>=5.6) && canImport(_Concurrency)`
`303`	`303`	`extension SharedValueObservation {`
`304`	`304`	`// MARK: - Asynchronous Observation`
`305`	`305`	`/// The database observation, as an asynchronous sequence of`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ extension ValueObservation: Refinable {`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`-#if compiler(>=5.5.2) && canImport(_Concurrency)`
	`255`	`+#if compiler(>=5.6) && canImport(_Concurrency)`
`256`	`256`	`extension ValueObservation {`
`257`	`257`	`// MARK: - Asynchronous Observation`
`258`	`258`	`/// The database observation, as an asynchronous sequence of`