Skip to content

Commit 4472d3a

Browse files
committed
Merge branch 'development'
2 parents 15c06e0 + dc03adb commit 4472d3a

23 files changed

+59
-52
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
77

88
#### 5.x Releases
99

10+
- `5.23.x` Releases - [5.23.0](#5230)
1011
- `5.22.x` Releases - [5.22.0](#5220) | [5.22.1](#5221) | [5.22.2](#5222)
1112
- `5.21.x` Releases - [5.21.0](#5210)
1213
- `5.20.x` Releases - [5.20.0](#5200)
@@ -89,6 +90,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
8990

9091
---
9192

93+
## 5.23.0
94+
95+
Released April 16, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v5.22.2...v5.23.0)
96+
97+
- **Breaking Change**: [#1200](https://github.com/groue/GRDB.swift/pull/1200) by [@groue](https://github.com/groue): Require Swift 5.6 Compiler for experimental Concurrency Support
98+
9299
## 5.22.2
93100

94101
Released April 2, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v5.22.1...v5.22.2)

Documentation/Concurrency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ try dbQueue.write { db in
137137
<details>
138138
<summary><b>Swift concurrency</b> (async/await)</summary>
139139

140-
[**:fire: EXPERIMENTAL**](../README.md#what-are-experimental-features) GRDB support for Swift concurrency requires Xcode 13.2+.
140+
[**:fire: EXPERIMENTAL**](../README.md#what-are-experimental-features) GRDB support for Swift concurrency requires Xcode 13.3.1+.
141141

142142
```swift
143143
let playerCount = try await dbQueue.read { db in

Documentation/FullTextSearch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ let pattern = FTS3Pattern(matchingAnyTokenIn: "") // nil
304304
let pattern = FTS3Pattern(matchingAnyTokenIn: "*") // nil
305305
```
306306

307-
FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.22/Structs/StatementArguments.html):
307+
FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.23/Structs/StatementArguments.html):
308308

309309
```swift
310310
let documents = try Document.fetchAll(db,
@@ -587,7 +587,7 @@ let pattern = FTS5Pattern(matchingAnyTokenIn: "") // nil
587587
let pattern = FTS5Pattern(matchingAnyTokenIn: "*") // nil
588588
```
589589

590-
FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.22/Structs/StatementArguments.html):
590+
FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/5.23/Structs/StatementArguments.html):
591591

592592
```swift
593593
let documents = try Document.fetchAll(db,

Documentation/Migrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ try dbQueue.read { db in
7777
}
7878
```
7979

80-
See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/5.22/Structs/DatabaseMigrator.html) for more migrator methods.
80+
See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/5.23/Structs/DatabaseMigrator.html) for more migrator methods.
8181

8282

8383
## The `eraseDatabaseOnSchemaChange` Option

GRDB.swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GRDB.swift'
3-
s.version = '5.22.2'
3+
s.version = '5.23.0'
44

55
s.license = { :type => 'MIT', :file => 'LICENSE' }
66
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'

GRDB/Core/DatabasePool.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public final class DatabasePool: DatabaseWriter {
160160
}
161161
}
162162

163-
#if swift(>=5.5) && canImport(_Concurrency)
163+
#if swift(>=5.6) && canImport(_Concurrency)
164164
// @unchecked because of databaseSnapshotCount and readerPool
165165
extension DatabasePool: @unchecked Sendable { }
166166
#endif

GRDB/Core/DatabaseReader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ extension DatabaseReader {
371371
}
372372
}
373373

374-
#if compiler(>=5.5.2) && canImport(_Concurrency)
374+
#if compiler(>=5.6) && canImport(_Concurrency)
375375
extension DatabaseReader {
376376
// MARK: - Asynchronous Database Access
377377

GRDB/Core/DatabaseValue.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ extension DatabaseValue: StatementBinding {
159159

160160
extension DatabaseValue: GRDBSendable { }
161161

162-
#if swift(>=5.5) && canImport(_Concurrency)
162+
#if swift(>=5.6) && canImport(_Concurrency)
163163
// @unchecked due to Foundation.Data not conforming to Sendable
164164
// TODO: Remove @unchecked when Foundation has been upgraded
165165
extension DatabaseValue.Storage: @unchecked Sendable { }

GRDB/Core/DatabaseWriter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ extension DatabaseWriter {
380380
}
381381
}
382382

383-
#if compiler(>=5.5.2) && canImport(_Concurrency)
383+
#if compiler(>=5.6) && canImport(_Concurrency)
384384
extension DatabaseWriter {
385385
// MARK: - Asynchronous Database Access
386386

GRDB/Core/Row.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2182,7 +2182,7 @@ struct ArrayRowImpl: RowImpl {
21822182
}
21832183
}
21842184

2185-
#if swift(>=5.5) && canImport(_Concurrency)
2185+
#if swift(>=5.6) && canImport(_Concurrency)
21862186
// @unchecked because columns property is not inferred as Sendable
21872187
// TODO: remove this @unchecked when compiler can handle tuples.
21882188
extension ArrayRowImpl: @unchecked Sendable { }

0 commit comments

Comments
 (0)