Merge pull request #1634 from groue/dev/GRDB7-bump-requirements

GRDB 7: Bump requirements (again)
groue · Sep 21, 2024 · 23842d8 · 23842d8
2 parents f794d98 + 46e1561
commit 23842d8
Show file tree

Hide file tree

Showing 88 changed files with 554 additions and 1,083 deletions.
diff --git a/GRDB.swift.podspec b/GRDB.swift.podspec
@@ -10,10 +10,10 @@ Pod::Spec.new do |s|
   s.module_name = 'GRDB'
 
   s.swift_versions = ['5.10']
-  s.ios.deployment_target = '12.0'
-  s.osx.deployment_target = '10.13'
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target = '10.15'
   s.watchos.deployment_target = '7.0'
-  s.tvos.deployment_target = '12.0'
+  s.tvos.deployment_target = '13.0'
   s.default_subspec  = 'standard'
 
   s.subspec 'standard' do |ss|

diff --git a/GRDB/Core/Database+Statements.swift b/GRDB/Core/Database+Statements.swift
@@ -492,17 +492,15 @@ extension Database {
         // and throws the user-provided cancelled commit error.
         try observationBroker?.statementDidFail(statement)
 
-        if #available(iOS 13, macOS 10.15, tvOS 13, *) {
-            switch ResultCode(rawValue: resultCode) {
-            case .SQLITE_INTERRUPT, .SQLITE_ABORT:
-                if suspensionMutex.load().isCancelled {
-                    // The only error that a user sees when a Task is cancelled
-                    // is CancellationError.
-                    throw CancellationError()
-                }
-            default:
-                break
+        switch ResultCode(rawValue: resultCode) {
+        case .SQLITE_INTERRUPT, .SQLITE_ABORT:
+            if suspensionMutex.load().isCancelled {
+                // The only error that a user sees when a Task is cancelled
+                // is CancellationError.
+                throw CancellationError()
             }
+        default:
+            break
         }
 
         // Throw statement failure
@@ -554,19 +552,7 @@ struct StatementCache {
         // > time and probably reused many times.
         //
         // This looks like a perfect match for cached statements.
-        //
-        // However SQLITE_PREPARE_PERSISTENT was only introduced in
-        // SQLite 3.20.0 http://www.sqlite.org/changes.html#version_3_20
-        #if GRDBCUSTOMSQLITE || GRDBCIPHER
         let statement = try db.makeStatement(sql: sql, prepFlags: CUnsignedInt(SQLITE_PREPARE_PERSISTENT))
-        #else
-        let statement: Statement
-        if #available(macOS 10.14, *) { // SQLite 3.20+
-            statement = try db.makeStatement(sql: sql, prepFlags: CUnsignedInt(SQLITE_PREPARE_PERSISTENT))
-        } else {
-            statement = try db.makeStatement(sql: sql)
-        }
-        #endif
         statements[sql] = statement
         return statement
     }

diff --git a/GRDB/Core/Database.swift b/GRDB/Core/Database.swift
@@ -1199,7 +1199,6 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
     /// will throw `CancellationError`, until `uncancel()` is called.
     ///
     /// This method can be called from any thread.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     func cancel() {
         let needsInterrupt = suspensionMutex.withLock { suspension in
             if suspension.isCancelled {
@@ -1216,7 +1215,6 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
     }
 
     /// Undo `cancel()`.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     func uncancel() {
         suspensionMutex.withLock {
             $0.isCancelled = false
@@ -1320,12 +1318,7 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
             break
 
         case .cancel:
-            if #available(iOS 13, macOS 10.15, tvOS 13, *) {
-                throw CancellationError()
-            } else {
-                // GRDB bug: cancellation is a Swift concurrency feature
-                fatalError("Can't cancel without support for Swift concurrency")
-            }
+            throw CancellationError()
 
         case .abort:
             // Attempt at releasing an eventual lock with ROLLBACk,

diff --git a/GRDB/Core/DatabasePool.swift b/GRDB/Core/DatabasePool.swift
@@ -351,7 +351,6 @@ extension DatabasePool: DatabaseReader {
         }
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -436,7 +435,6 @@ extension DatabasePool: DatabaseReader {
         }
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -803,7 +801,6 @@ extension DatabasePool: DatabaseWriter {
         try writer.sync(updates)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func writeWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -820,7 +817,6 @@ extension DatabasePool: DatabaseWriter {
         }
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func barrierWriteWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {

diff --git a/GRDB/Core/DatabasePublishers.swift b/GRDB/Core/DatabasePublishers.swift
@@ -1,5 +1,4 @@
 #if canImport(Combine)
 /// A namespace for database Combine publishers.
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 public enum DatabasePublishers { }
 #endif
diff --git a/GRDB/Core/DatabaseQueue.swift b/GRDB/Core/DatabaseQueue.swift
@@ -233,7 +233,6 @@ extension DatabaseQueue: DatabaseReader {
         }
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -272,7 +271,6 @@ extension DatabaseQueue: DatabaseReader {
         try writer.sync(value)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -386,7 +384,6 @@ extension DatabaseQueue: DatabaseWriter {
         try writer.sync(updates)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func writeWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -398,7 +395,6 @@ extension DatabaseQueue: DatabaseWriter {
         try writer.sync(updates)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func barrierWriteWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {

diff --git a/GRDB/Core/DatabaseReader.swift b/GRDB/Core/DatabaseReader.swift
@@ -216,7 +216,6 @@ public protocol DatabaseReader: AnyObject, Sendable {
     /// - throws: Any ``DatabaseError`` that happens while establishing the
     ///   database access, or the error thrown by `value`, or
     ///   `CancellationError` if the task is cancelled.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T
@@ -323,7 +322,6 @@ public protocol DatabaseReader: AnyObject, Sendable {
     /// - throws: Any ``DatabaseError`` that happens while establishing the
     ///   database access, or the error thrown by `value`, or
     ///   `CancellationError` if the task is cancelled.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T
@@ -535,7 +533,6 @@ extension DatabaseReader {
     ///
     /// - parameter scheduler: A Combine Scheduler.
     /// - parameter value: A closure which accesses the database.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func readPublisher<Output>(
         receiveOn scheduler: some Combine.Scheduler = DispatchQueue.main,
         value: @escaping @Sendable (Database) throws -> Output
@@ -550,7 +547,6 @@ extension DatabaseReader {
     }
 }
 
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 extension DatabasePublishers {
     /// A publisher that reads from the database.
     ///
@@ -569,7 +565,6 @@ extension DatabasePublishers {
     }
 }
 
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 extension Publisher where Failure == Error {
     fileprivate func eraseToReadPublisher() -> DatabasePublishers.Read<Output> {
         .init(upstream: eraseToAnyPublisher())
@@ -660,7 +655,6 @@ extension AnyDatabaseReader: DatabaseReader {
         try base.read(value)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -678,7 +672,6 @@ extension AnyDatabaseReader: DatabaseReader {
         try base.unsafeRead(value)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {

diff --git a/GRDB/Core/DatabaseRegionObservation.swift b/GRDB/Core/DatabaseRegionObservation.swift
@@ -128,7 +128,6 @@ extension DatabaseRegionObservation {
 }
 
 #if canImport(Combine)
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 extension DatabaseRegionObservation {
     // MARK: - Publishing Impactful Transactions
 
@@ -140,7 +139,6 @@ extension DatabaseRegionObservation {
     ///
     /// Do not reschedule the publisher with `receive(on:options:)` or any
     /// `Publisher` method that schedules publisher elements.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func publisher(in writer: some DatabaseWriter) -> DatabasePublishers.DatabaseRegion {
         DatabasePublishers.DatabaseRegion(self, in: writer)
     }
@@ -186,7 +184,6 @@ private class DatabaseRegionObserver: TransactionObserver {
 }
 
 #if canImport(Combine)
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 extension DatabasePublishers {
     /// A publisher that tracks transactions that modify a database region.
     ///

diff --git a/GRDB/Core/DatabaseSnapshot.swift b/GRDB/Core/DatabaseSnapshot.swift
@@ -151,7 +151,6 @@ extension DatabaseSnapshot: DatabaseSnapshotReader {
         try reader.sync(block)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -173,7 +172,6 @@ extension DatabaseSnapshot: DatabaseSnapshotReader {
     // We can't provide this as a default implementation in
     // `DatabaseSnapshotReader`,  because of
     // <https://github.com/apple/swift/issues/74469>.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {

diff --git a/GRDB/Core/DatabaseSnapshotPool.swift b/GRDB/Core/DatabaseSnapshotPool.swift
@@ -293,7 +293,6 @@ extension DatabaseSnapshotPool: DatabaseSnapshotReader {
         }
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -353,7 +352,6 @@ extension DatabaseSnapshotPool: DatabaseSnapshotReader {
     // We can't provide this as a default implementation in
     // `DatabaseSnapshotReader`,  because of
     // <https://github.com/apple/swift/issues/74469>.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {

diff --git a/GRDB/Core/DatabaseWriter.swift b/GRDB/Core/DatabaseWriter.swift
@@ -131,7 +131,6 @@ public protocol DatabaseWriter: DatabaseReader {
     /// - throws: Any ``DatabaseError`` that happens while establishing the
     ///   database access, or the error thrown by `updates`, or
     ///   `CancellationError` if the task is cancelled.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     func writeWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T
@@ -217,7 +216,6 @@ public protocol DatabaseWriter: DatabaseReader {
     /// - throws: Any ``DatabaseError`` that happens while establishing the
     ///   database access, or the error thrown by `updates`, or
     ///   `CancellationError` if the task is cancelled.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     func barrierWriteWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T
@@ -649,7 +647,6 @@ extension DatabaseWriter {
     /// - throws: Any ``DatabaseError`` that happens while establishing the
     ///   database access, or the error thrown by `updates`, or
     ///   `CancellationError` if the task is cancelled.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func write<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -666,7 +663,6 @@ extension DatabaseWriter {
     /// Erase the database: delete all content, drop all tables, etc.
     ///
     /// - note: [**🔥 EXPERIMENTAL**](https://github.com/groue/GRDB.swift/blob/master/README.md#what-are-experimental-features)
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func erase() async throws {
         try await writeWithoutTransaction { try $0.erase() }
     }
@@ -677,7 +673,6 @@ extension DatabaseWriter {
     /// - note: [**🔥 EXPERIMENTAL**](https://github.com/groue/GRDB.swift/blob/master/README.md#what-are-experimental-features)
     ///
     /// Related SQLite documentation: <https://www.sqlite.org/lang_vacuum.html>
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func vacuum() async throws {
         try await writeWithoutTransaction { try $0.execute(sql: "VACUUM") }
     }
@@ -694,7 +689,6 @@ extension DatabaseWriter {
     /// Related SQLite documentation: <https://www.sqlite.org/lang_vacuum.html#vacuuminto>
     ///
     /// - Parameter filePath: file path for new database
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func vacuum(into filePath: String) async throws {
         try await writeWithoutTransaction {
             try $0.execute(sql: "VACUUM INTO ?", arguments: [filePath])
@@ -709,7 +703,6 @@ extension DatabaseWriter {
     /// Related SQLite documentation: <https://www.sqlite.org/lang_vacuum.html#vacuuminto>
     ///
     /// - Parameter filePath: file path for new database
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func vacuum(into filePath: String) async throws {
         try await writeWithoutTransaction {
             try $0.execute(sql: "VACUUM INTO ?", arguments: [filePath])
@@ -754,7 +747,6 @@ extension DatabaseWriter {
     ///
     /// - parameter scheduler: A Combine Scheduler.
     /// - parameter updates: A closure which accesses the database.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func writePublisher<Output>(
         receiveOn scheduler: some Combine.Scheduler = DispatchQueue.main,
         updates: @escaping @Sendable (Database) throws -> Output
@@ -818,7 +810,6 @@ extension DatabaseWriter {
     /// - parameter scheduler: A Combine Scheduler.
     /// - parameter updates: A closure which writes in the database.
     /// - parameter value: A closure which reads from the database.
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func writePublisher<T: Sendable, Output>(
         receiveOn scheduler: some Combine.Scheduler = DispatchQueue.main,
         updates: @escaping @Sendable (Database) throws -> T,
@@ -848,7 +839,6 @@ extension DatabaseWriter {
     }
 }
 
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 extension DatabasePublishers {
     /// A publisher that writes into the database.
     ///
@@ -867,7 +857,6 @@ extension DatabasePublishers {
     }
 }
 
-@available(iOS 13, macOS 10.15, tvOS 13, *)
 extension Publisher where Failure == Error {
     fileprivate func eraseToWritePublisher() -> DatabasePublishers.Write<Output> {
         .init(upstream: self.eraseToAnyPublisher())
@@ -911,7 +900,6 @@ extension AnyDatabaseWriter: DatabaseReader {
         try base.read(value)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func read<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -929,7 +917,6 @@ extension AnyDatabaseWriter: DatabaseReader {
         try base.unsafeRead(value)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func unsafeRead<T: Sendable>(
         _ value: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -964,7 +951,6 @@ extension AnyDatabaseWriter: DatabaseWriter {
         try base.writeWithoutTransaction(updates)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func writeWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {
@@ -976,7 +962,6 @@ extension AnyDatabaseWriter: DatabaseWriter {
         try base.barrierWriteWithoutTransaction(updates)
     }
 
-    @available(iOS 13, macOS 10.15, tvOS 13, *)
     public func barrierWriteWithoutTransaction<T: Sendable>(
         _ updates: @escaping @Sendable (Database) throws -> T
     ) async throws -> T {