Merge branch 'development'

groue · Sep 29, 2024 · 47a7ddf · 47a7ddf
2 parents 2cf6c75 + ecd4658
commit 47a7ddf
Show file tree

Hide file tree

Showing 464 changed files with 9,329 additions and 11,855 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,8 @@
+[*.swift]
+indent_style = space
+indent_size = 4
+tab_width = 4
+end_of_line = lf
+insert_final_newline = true
+max_line_length = 76
+trim_trailing_whitespace = true
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,4 +1,4 @@
-# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
 
 name: "GRDB CI"
 
@@ -40,42 +40,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
             destination: "platform=macOS"
             name: "macOS"
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            destination: "OS=16.4,name=iPhone 14 Pro"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            destination: "OS=18.1,name=iPhone 15 Pro"
             name: "iOS"
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            destination: "OS=16.4,name=Apple TV"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            destination: "OS=18.0,name=Apple TV"
             name: "tvOS"
-          - xcode: "Xcode_14.2.app"
-            runsOn: macOS-13
-            destination: "platform=macOS"
-            name: "macOS"
-          - xcode: "Xcode_14.2.app"
-            runsOn: macOS-13
-            destination: "OS=16.2,name=iPhone 14"
-            name: "iOS"
-          - xcode: "Xcode_14.1.app"
-            runsOn: macOS-13
-            destination: "platform=macOS"
-            name: "macOS"
-          - xcode: "Xcode_14.1.app"
-            runsOn: macOS-13
-            destination: "OS=16.1,name=iPhone 14"
-            name: "iOS"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            destination: "platform=macOS"
-            name: "macOS"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            destination: "OS=16.0,name=iPhone 14"
-            name: "iOS"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -90,18 +66,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            name: "Xcode 14.3.1"
-          - xcode: "Xcode_14.2.app"
-            runsOn: macOS-13
-            name: "Xcode 14.2"
-          - xcode: "Xcode_14.1.app"
-            runsOn: macOS-13
-            name: "Xcode 14.1"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            name: "Xcode 14.0.1"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            name: "Xcode 16.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -116,12 +83,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            name: "Xcode 14.3.1"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            name: "Xcode 14.0.1"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            name: "Xcode 16.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -136,12 +100,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            name: "Xcode 14.3.1"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            name: "Xcode 14.0.1"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            name: "Xcode 16.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -156,12 +117,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            name: "Xcode 14.3.1"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            name: "Xcode 14.0.1"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            name: "Xcode 16.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}
@@ -176,12 +134,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.3.1.app"
-            runsOn: macOS-13
-            name: "Xcode 14.3.1"
-          - xcode: "Xcode_14.0.1.app"
-            runsOn: macOS-12
-            name: "Xcode 14.0.1"
+          - xcode: "Xcode_16.1.app"
+            runsOn: macOS-14
+            name: "Xcode 16.1"
     steps:
       - uses: actions/checkout@v4
       - name: ${{ matrix.name }}

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/GRDB-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/GRDB-Package.xcscheme
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 
 GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception: APIs flagged [**:fire: EXPERIMENTAL**](README.md#what-are-experimental-features). Those are unstable, and may break between any two minor releases of the library.
 
+#### 7.x Releases
+
+- `7.0.0` Betas - [7.0.0-beta](#700-beta)
+
 #### 6.x Releases
 
 - `6.29.x` Releases - [6.29.0](#6290) - [6.29.1](#6291) - [6.29.2](#6292) - [6.29.3](#6293)
@@ -127,6 +131,32 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 7.0.0-beta
+
+Released September 29, 2024
+
+**GRDB 7 brings full support for Swift 6.**
+
+[Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md) describes in detail how to bump the GRDB version in your application.
+
+The new [Swift Concurrency and GRDB](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/swiftconcurrency) guide explains how to best integrate GRDB and Swift Concurrency.
+
+The [demo app](Documentation/DemoApps/) was rewritten from scratch in a brand new Xcode 16 project.
+
+- **Breaking Change**: Bump requirements by [@groue](https://github.com/groue) in [#1598](https://github.com/groue/GRDB.swift/pull/1598) and  [#1634](https://github.com/groue/GRDB.swift/pull/1634)
+- **Breaking Change**: Enhance ergonomics of record methods that insert/save/upsert and fetch by [@groue](https://github.com/groue) in [#1599](https://github.com/groue/GRDB.swift/pull/1599)
+- **Breaking Change**: Rename the CSQLite module to GRDBSQLite, and stop exporting the C SQLite functions by [@groue](https://github.com/groue) in [#1600](https://github.com/groue/GRDB.swift/pull/1600)
+- **Breaking Change**: Perform all writes with immediate transactions by default by [@groue](https://github.com/groue) in [#1602](https://github.com/groue/GRDB.swift/pull/1602)
+- **Breaking Change**: Remove DatabasePool.concurrentRead by [@groue](https://github.com/groue) in [#1603](https://github.com/groue/GRDB.swift/pull/1603)
+- **Breaking Change**: Coding strategies depend on the column by [@groue](https://github.com/groue) in [#1606](https://github.com/groue/GRDB.swift/pull/1606)
+- **Breaking Change**: Add missing Sendable conformances by [@groue](https://github.com/groue) in [#1607](https://github.com/groue/GRDB.swift/pull/1607) and [#1639](https://github.com/groue/GRDB.swift/pull/1639)
+- **Breaking Change**: Async database accesses honor Task cancellation by [@groue](https://github.com/groue) in [#1610](https://github.com/groue/GRDB.swift/pull/1610)
+- **Breaking Change**: Prefer Collection over Sequence for filter(keys:) and related APIs by [@groue](https://github.com/groue) in [#1617](https://github.com/groue/GRDB.swift/pull/1617)
+- **Breaking Change**: MainActor ValueObservation scheduling by [@groue](https://github.com/groue) in [#1633](https://github.com/groue/GRDB.swift/pull/1633)
+- **Breaking Change**: Prefer any DatabaseReader and DatabaseWriter by [@groue](https://github.com/groue) in [#1635](https://github.com/groue/GRDB.swift/pull/1635)
+- **New**: Sendable database accesses by [@groue](https://github.com/groue) in [#1618](https://github.com/groue/GRDB.swift/pull/1618)
+- **New**: DatabaseCursor has a primary associated type by [@groue](https://github.com/groue) in [#1605](https://github.com/groue/GRDB.swift/pull/1605)
+
 ## 6.29.3
 
 Released September 7, 2024

diff --git a/Documentation/AssociationsBasics.md b/Documentation/AssociationsBasics.md
@@ -137,9 +137,7 @@ Before we dive in, please remember that associations can not generate all possib
 
 **Associations are available on types that adopt the necessary supporting protocols.**
 
-When your record type is a subclass of the [Record class], all necessary protocols are already setup and ready: you can skip this chapter.
-
-Generally speaking, associations use the [TableRecord], [FetchableRecord], and [EncodableRecord] protocols:
+Associations are based on the [TableRecord], [FetchableRecord], and [EncodableRecord] protocols:
 
 - **[TableRecord]** is the protocol that lets you declare associations between record types:
 
@@ -3005,7 +3003,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [TableRecord]: ../README.md#tablerecord-protocol
 [Recommended Practices for Designing Record Types]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/recordrecommendedpractices
 [regular aggregating methods]: ../README.md#fetching-aggregated-values
-[Record class]: ../README.md#record-class
 [EncodableRecord]: ../README.md#persistablerecord-protocol
 [PersistableRecord]: ../README.md#persistablerecord-protocol
 [Codable Records]: ../README.md#codable-records