Merge branch 'development'

groue · Sep 27, 2020 · 6884bf1 · 6884bf1
2 parents 1ea4a44 + 8803eaf
commit 6884bf1
Show file tree

Hide file tree

Showing 25 changed files with 416 additions and 426 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,117 +28,122 @@ jobs:
   include:
 
     ###########################################
-    ## Test GRDB Xcode 11.6
+    ## Test GRDB Xcode 12
 
-    - name: "Test GRDB Xcode 11.6 - GRDBOSX"
+    - name: "Test GRDB Xcode 12 - GRDBOSX - Swift 5.3"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBOSX_maxSwift
 
-    - name: "Test GRDB Xcode 11.6 - GRDBWatchOS"
+    - name: "Test GRDB Xcode 12 - GRDBOSX - Swift 5.2"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
+      script: make test_framework_GRDBOSX_minSwift
+
+    - name: "Test GRDB Xcode 12 - GRDBWatchOS"
+      gemfile: .ci/gemfiles/Gemfile.travis
+      osx_image: xcode12
       script: make test_framework_GRDBWatchOS
 
-    - name: "Test GRDB Xcode 11.6 - GRDBiOS iOS maxTarget"
+    - name: "Test GRDB Xcode 12 - GRDBiOS iOS maxTarget"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBiOS_maxTarget_maxSwift
 
-    - name: "Test GRDB Xcode 11.6 - GRDBiOS iOS minTarget"
+    - name: "Test GRDB Xcode 12 - GRDBiOS iOS minTarget"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBiOS_minTarget
 
-    - name: "Test GRDB Xcode 11.6 - GRDBtvOS maxTarget"
+    - name: "Test GRDB Xcode 12 - GRDBtvOS maxTarget"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBtvOS_maxTarget_maxSwift
 
-    - name: "Test GRDB Xcode 11.6 - GRDBtvOS minTarget"
+    - name: "Test GRDB Xcode 12 - GRDBtvOS minTarget"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBtvOS_minTarget
 
-    - name: "Test GRDB Xcode 11.6 - SPM"
+    - name: "Test GRDB Xcode 12 - SPM"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_SPM
 
     ###########################################
-    ## Test GRDBCustom Xcode 11.6
+    ## Test GRDBCustom Xcode 12
 
-    - name: "Test GRDBCustom Xcode 11.6 - GRDBOSX"
+    - name: "Test GRDBCustom Xcode 12 - GRDBOSX"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBCustomSQLiteOSX
 
-    - name: "Test GRDBCustom Xcode 11.6 - GRDBiOS maxTarget"
+    - name: "Test GRDBCustom Xcode 12 - GRDBiOS maxTarget"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift
 
-    - name: "Test GRDBCustom Xcode 11.6 - GRDBiOS minTarget"
+    - name: "Test GRDBCustom Xcode 12 - GRDBiOS minTarget"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_GRDBCustomSQLiteiOS_minTarget
 
     ###########################################
-    ## Test SQLCipher Xcode 11.6
+    ## Test SQLCipher Xcode 12
 
-    - name: "Test SQLCipher Xcode 11.6 - SQLCipher 3"
+    - name: "Test SQLCipher Xcode 12 - SQLCipher 3"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_SQLCipher3
 
-    - name: "Test SQLCipher Xcode 11.6 - SQLCipher 4"
+    - name: "Test SQLCipher Xcode 12 - SQLCipher 4"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_framework_SQLCipher4
 
     ###########################################
-    ## Test Installation Xcode 11.6
+    ## Test Installation Xcode 12
 
     # Manual Install
-    - name: "Test Installation Xcode 11.6 - Manual Install"
+    - name: "Test Installation Xcode 12 - Manual Install"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_install_manual
 
     # CocoaPods Lint
-    - name: "Test Installation Xcode 11.6 - CocoaPods Lint"
+    - name: "Test Installation Xcode 12 - CocoaPods Lint"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_CocoaPodsLint_GRDB
 
     # CocoaPods Install GRDB
-    - name: "Test Installation Xcode 11.6 - CocoaPods Framework"
+    - name: "Test Installation Xcode 12 - CocoaPods Framework"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_install_GRDB_CocoaPods_framework
 
     # CocoaPods Install GRDB
-    - name: "Test Installation Xcode 11.6 - CocoaPods Static"
+    - name: "Test Installation Xcode 12 - CocoaPods Static"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_install_GRDB_CocoaPods_static
 
     # SPM Install
-    - name: "Test Installation Xcode 11.6 - SPM Package"
+    - name: "Test Installation Xcode 12 - SPM Package"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_install_SPM_Package
 
     # SPM Install
-    - name: "Test Installation Xcode 11.6 - SPM Package in Xcode Project"
+    - name: "Test Installation Xcode 12 - SPM Package in Xcode Project"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_install_SPM_Project
 
     # Custom SQLite Install
-    - name: "Test Installation Xcode 11.6 - Custom SQLite"
+    - name: "Test Installation Xcode 12 - Custom SQLite"
       gemfile: .ci/gemfiles/Gemfile.travis
-      osx_image: xcode11.6
+      osx_image: xcode12
       script: make test_install_customSQLite
 
     ###########################################

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +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.
 
-<!--
-[Next Release](#next-release)
--->
-
 #### 5.x Releases
 
-- `5.0.x` Releases - [5.0.0](#500)
+<!-- - [Next Release](#next-release) -->
+- `5.0.x` Releases - [5.0.0](#500) | [5.0.1](#501)
 - `5.0.0` Betas - [5.0.0-beta](#500-beta) | [5.0.0-beta.2](#500-beta2) | [5.0.0-beta.3](#500-beta3) | [5.0.0-beta.4](#500-beta4) | [5.0.0-beta.5](#500-beta5) | [5.0.0-beta.6](#500-beta6) | [5.0.0-beta.7](#500-beta7) | [5.0.0-beta.8](#500-beta8) | [5.0.0-beta.9](#500-beta9) | [5.0.0-beta.10](#500-beta10) | [5.0.0-beta.11](#500-beta11)
 
 
@@ -71,6 +68,14 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 - [0.110.0](#01100), ...
 
 
+## 5.0.1
+
+Released September 27, 2020 &bull; [diff](https://github.com/groue/GRDB.swift/compare/v5.0.0...v5.0.1)
+
+- **Fixed**: [#841](https://github.com/groue/GRDB.swift/issues/841): Fix GRDB 5 regression with indexes on expressions
+- The [GRDBCombineDemo](Documentation/DemoApps/GRDBCombineDemo/README.md) Combine + SwiftUI demo application was updated for the SwiftUI App lifecycle introduced in iOS 14.
+
+
 ## 5.0.0
 
 Released September 20, 2020 &bull; [diff](https://github.com/groue/GRDB.swift/compare/v5.0.0-beta.11...v5.0.0)