Merge branch 'development'

Author: groue

CHANGELOG.md

@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 5.x Releases
 
+- `5.21.x` Releases - [5.21.0](#5210)
 - `5.20.x` Releases - [5.20.0](#5200)
 - `5.19.x` Releases - [5.19.0](#5190)
 - `5.18.x` Releases - [5.18.0](#5180)
@@ -87,6 +88,14 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 5.21.0
+
+Released February 6, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v5.20.0...v5.21.0)
+
+- **New**: [#1165](https://github.com/groue/GRDB.swift/pull/1165) by [@guidedways](https://github.com/guidedways): Support dynamic linking via Swift Package Manager
+- **Breaking Change**: [#1164](https://github.com/groue/GRDB.swift/pull/1164) by [@groue](https://github.com/groue): Drop experimental async apis from DatabaseMigrator
+
+
 ## 5.20.0
 
 Released February 1, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v5.19.0...v5.20.0)

Documentation/FullTextSearch.md

@@ -304,7 +304,7 @@ let pattern = FTS3Pattern(matchingAnyTokenIn: "")  // nil
 let pattern = FTS3Pattern(matchingAnyTokenIn: "*") // nil
 ```
 
-FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.20/Structs/StatementArguments.html):
+FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.21/Structs/StatementArguments.html):
 
 ```swift
 let documents = try Document.fetchAll(db,
@@ -587,7 +587,7 @@ let pattern = FTS5Pattern(matchingAnyTokenIn: "")  // nil
 let pattern = FTS5Pattern(matchingAnyTokenIn: "*") // nil
 ```
 
-FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.20/Structs/StatementArguments.html):
+FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.21/Structs/StatementArguments.html):
 
 ```swift
 let documents = try Document.fetchAll(db,

Documentation/Migrations.md

@@ -77,7 +77,7 @@ try dbQueue.read { db in
 }
 ```
 
-See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/5.20/Structs/DatabaseMigrator.html) for more migrator methods.
+See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/5.21/Structs/DatabaseMigrator.html) for more migrator methods.
 
 
 ## The `eraseDatabaseOnSchemaChange` Option
@@ -268,13 +268,7 @@ while let violation = try violations.next() {
 
 ## Asynchronous Migrations
 
-`DatabaseMigrator` provides three ways to migrate a database in an asynchronous way.
-
-The async `migrate()` method:
-
-```swift
-try await migrator.migrate(dbQueue)
-```
+`DatabaseMigrator` provides the following ways to migrate a database in an asynchronous way.
 
 The `asyncMigrate(_:completion:)` method:
 

GRDB.swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'GRDB.swift'
-  s.version  = '5.20.0'
+  s.version  = '5.21.0'
 
   s.license  = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'A toolkit for SQLite databases, with a focus on application development.'

GRDB/Migration/DatabaseMigrator.swift

@@ -3,6 +3,7 @@ import Combine
 #endif
 import Foundation
 
+// TODO: provide concurrent apis for migrations that run @Sendable closures.
 /// A DatabaseMigrator registers and applies database migrations.
 ///
 /// Migrations are named blocks of SQL statements that are guaranteed to be
@@ -196,33 +197,13 @@ public struct DatabaseMigrator {
     /// - parameter writer: A DatabaseWriter (DatabaseQueue or DatabasePool)
     ///   where migrations should apply.
     /// - throws: An eventual error thrown by the registered migration blocks.
-    @_disfavoredOverload // SR-15150 Async overloading in protocol implementation fails
     public func migrate(_ writer: DatabaseWriter) throws {
         guard let lastMigration = _migrations.last else {
             return
         }
         try migrate(writer, upTo: lastMigration.identifier)
     }
 
-    #if compiler(>=5.5.2) && canImport(_Concurrency)
-    /// Iterate migrations in the same order as they were registered. If a
-    /// migration has not yet been applied, its block is executed in
-    /// a transaction.
-    ///
-    /// [**Experimental**](http://github.com/groue/GRDB.swift#what-are-experimental-features)
-    ///
-    /// - parameter writer: A DatabaseWriter (DatabaseQueue or DatabasePool)
-    ///   where migrations should apply.
-    /// - throws: An eventual error thrown by the registered migration blocks.
-    @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
-    public func migrate(_ writer: DatabaseWriter) async throws {
-        guard let lastMigration = _migrations.last else {
-            return
-        }
-        try await migrate(writer, upTo: lastMigration.identifier)
-    }
-    #endif
-    
     /// Iterate migrations in the same order as they were registered, up to the
     /// provided target. If a migration has not yet been applied, its block is
     /// executed in a transaction.
@@ -231,32 +212,12 @@ public struct DatabaseMigrator {
     ///   where migrations should apply.
     /// - parameter targetIdentifier: The identifier of a registered migration.
     /// - throws: An eventual error thrown by the registered migration blocks.
-    @_disfavoredOverload // SR-15150 Async overloading in protocol implementation fails
     public func migrate(_ writer: DatabaseWriter, upTo targetIdentifier: String) throws {
         try writer.barrierWriteWithoutTransaction { db in
             try migrate(db, upTo: targetIdentifier)
         }
     }
 
-    #if compiler(>=5.5.2) && canImport(_Concurrency)
-    /// Iterate migrations in the same order as they were registered, up to the
-    /// provided target. If a migration has not yet been applied, its block is
-    /// executed in a transaction.
-    ///
-    /// [**Experimental**](http://github.com/groue/GRDB.swift#what-are-experimental-features)
-    ///
-    /// - parameter writer: A DatabaseWriter (DatabaseQueue or DatabasePool)
-    ///   where migrations should apply.
-    /// - parameter targetIdentifier: The identifier of a registered migration.
-    /// - throws: An eventual error thrown by the registered migration blocks.
-    @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
-    public func migrate(_ writer: DatabaseWriter, upTo targetIdentifier: String) async throws {
-        try await writer.barrierWriteWithoutTransaction { [self] db in
-            try migrate(db, upTo: targetIdentifier)
-        }
-    }
-    #endif
-    
     /// Iterate migrations in the same order as they were registered. If a
     /// migration has not yet been applied, its block is executed in
     /// a transaction.

Makefile

@@ -379,7 +379,7 @@ test_install_manual:
 	  clean build \
 	  $(XCPRETTY)
 
-test_install_SPM: test_install_SPM_Package test_install_SPM_Project test_install_SPM_macos_release test_install_SPM_ios_release
+test_install_SPM: test_install_SPM_Package test_install_SPM_Project test_install_SPM_Dynamic_Project test_install_SPM_macos_release test_install_SPM_ios_release
 
 test_install_SPM_Package:
 	cd Tests/SPM/PlainPackage && \
@@ -393,6 +393,15 @@ test_install_SPM_Project:
 	  -configuration Release \
 	  clean build \
 	  $(XCPRETTY)
+	  
+test_install_SPM_Dynamic_Project:
+	$(XCODEBUILD) \
+	  -project Tests/SPM/ios-dynamic/ios-dynamic.xcodeproj \
+	  -scheme ios-dynamic \
+	  -destination $(MAX_IOS_DESTINATION) \
+	  -configuration Release \
+	  clean build \
+	  $(XCPRETTY)
 
 test_install_SPM_macos_release:
 	$(XCODEBUILD) \
@@ -520,10 +529,10 @@ ifdef JAZZY
 	  --author 'Gwendal Roué' \
 	  --author_url https://github.com/groue \
 	  --github_url https://github.com/groue/GRDB.swift \
-	  --github-file-prefix https://github.com/groue/GRDB.swift/tree/v5.20.0 \
-	  --module-version 5.20.0 \
+	  --github-file-prefix https://github.com/groue/GRDB.swift/tree/v5.21.0 \
+	  --module-version 5.21.0 \
 	  --module GRDB \
-	  --root-url http://groue.github.io/GRDB.swift/docs/5.20/ \
+	  --root-url http://groue.github.io/GRDB.swift/docs/5.21/ \
 	  --output Documentation/Reference \
 	  --xcodebuild-arguments -project,GRDB.xcodeproj,-scheme,GRDBiOS
 else

Package.swift

@@ -13,6 +13,7 @@ let package = Package(
     ],
     products: [
         .library(name: "GRDB", targets: ["GRDB"]),
+        .library(name: "GRDB-dynamic", type: .dynamic, targets: ["GRDB"]),
     ],
     dependencies: [
     ],