Skip to content

Commit 6884bf1

Browse files
grouegroue
committed
Merge branch 'development'
2 parents 1ea4a44 + 8803eaf commit 6884bf1

File tree

25 files changed

+416
-426
lines changed

25 files changed

+416
-426
lines changed

‎.travis.yml‎

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,117 +28,122 @@ jobs:
2828
include:
2929

3030
###########################################
31-
## Test GRDB Xcode 11.6
31+
## Test GRDB Xcode 12
3232

33-
- name: "Test GRDB Xcode 11.6 - GRDBOSX"
33+
- name: "Test GRDB Xcode 12 - GRDBOSX - Swift 5.3"
3434
gemfile: .ci/gemfiles/Gemfile.travis
35-
osx_image: xcode11.6
35+
osx_image: xcode12
3636
script: make test_framework_GRDBOSX_maxSwift
3737

38-
- name: "Test GRDB Xcode 11.6 - GRDBWatchOS"
38+
- name: "Test GRDB Xcode 12 - GRDBOSX - Swift 5.2"
3939
gemfile: .ci/gemfiles/Gemfile.travis
40-
osx_image: xcode11.6
40+
osx_image: xcode12
41+
script: make test_framework_GRDBOSX_minSwift
42+
43+
- name: "Test GRDB Xcode 12 - GRDBWatchOS"
44+
gemfile: .ci/gemfiles/Gemfile.travis
45+
osx_image: xcode12
4146
script: make test_framework_GRDBWatchOS
4247

43-
- name: "Test GRDB Xcode 11.6 - GRDBiOS iOS maxTarget"
48+
- name: "Test GRDB Xcode 12 - GRDBiOS iOS maxTarget"
4449
gemfile: .ci/gemfiles/Gemfile.travis
45-
osx_image: xcode11.6
50+
osx_image: xcode12
4651
script: make test_framework_GRDBiOS_maxTarget_maxSwift
4752

48-
- name: "Test GRDB Xcode 11.6 - GRDBiOS iOS minTarget"
53+
- name: "Test GRDB Xcode 12 - GRDBiOS iOS minTarget"
4954
gemfile: .ci/gemfiles/Gemfile.travis
50-
osx_image: xcode11.6
55+
osx_image: xcode12
5156
script: make test_framework_GRDBiOS_minTarget
5257

53-
- name: "Test GRDB Xcode 11.6 - GRDBtvOS maxTarget"
58+
- name: "Test GRDB Xcode 12 - GRDBtvOS maxTarget"
5459
gemfile: .ci/gemfiles/Gemfile.travis
55-
osx_image: xcode11.6
60+
osx_image: xcode12
5661
script: make test_framework_GRDBtvOS_maxTarget_maxSwift
5762

58-
- name: "Test GRDB Xcode 11.6 - GRDBtvOS minTarget"
63+
- name: "Test GRDB Xcode 12 - GRDBtvOS minTarget"
5964
gemfile: .ci/gemfiles/Gemfile.travis
60-
osx_image: xcode11.6
65+
osx_image: xcode12
6166
script: make test_framework_GRDBtvOS_minTarget
6267

63-
- name: "Test GRDB Xcode 11.6 - SPM"
68+
- name: "Test GRDB Xcode 12 - SPM"
6469
gemfile: .ci/gemfiles/Gemfile.travis
65-
osx_image: xcode11.6
70+
osx_image: xcode12
6671
script: make test_SPM
6772

6873
###########################################
69-
## Test GRDBCustom Xcode 11.6
74+
## Test GRDBCustom Xcode 12
7075

71-
- name: "Test GRDBCustom Xcode 11.6 - GRDBOSX"
76+
- name: "Test GRDBCustom Xcode 12 - GRDBOSX"
7277
gemfile: .ci/gemfiles/Gemfile.travis
73-
osx_image: xcode11.6
78+
osx_image: xcode12
7479
script: make test_framework_GRDBCustomSQLiteOSX
7580

76-
- name: "Test GRDBCustom Xcode 11.6 - GRDBiOS maxTarget"
81+
- name: "Test GRDBCustom Xcode 12 - GRDBiOS maxTarget"
7782
gemfile: .ci/gemfiles/Gemfile.travis
78-
osx_image: xcode11.6
83+
osx_image: xcode12
7984
script: make test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift
8085

81-
- name: "Test GRDBCustom Xcode 11.6 - GRDBiOS minTarget"
86+
- name: "Test GRDBCustom Xcode 12 - GRDBiOS minTarget"
8287
gemfile: .ci/gemfiles/Gemfile.travis
83-
osx_image: xcode11.6
88+
osx_image: xcode12
8489
script: make test_framework_GRDBCustomSQLiteiOS_minTarget
8590

8691
###########################################
87-
## Test SQLCipher Xcode 11.6
92+
## Test SQLCipher Xcode 12
8893

89-
- name: "Test SQLCipher Xcode 11.6 - SQLCipher 3"
94+
- name: "Test SQLCipher Xcode 12 - SQLCipher 3"
9095
gemfile: .ci/gemfiles/Gemfile.travis
91-
osx_image: xcode11.6
96+
osx_image: xcode12
9297
script: make test_framework_SQLCipher3
9398

94-
- name: "Test SQLCipher Xcode 11.6 - SQLCipher 4"
99+
- name: "Test SQLCipher Xcode 12 - SQLCipher 4"
95100
gemfile: .ci/gemfiles/Gemfile.travis
96-
osx_image: xcode11.6
101+
osx_image: xcode12
97102
script: make test_framework_SQLCipher4
98103

99104
###########################################
100-
## Test Installation Xcode 11.6
105+
## Test Installation Xcode 12
101106

102107
# Manual Install
103-
- name: "Test Installation Xcode 11.6 - Manual Install"
108+
- name: "Test Installation Xcode 12 - Manual Install"
104109
gemfile: .ci/gemfiles/Gemfile.travis
105-
osx_image: xcode11.6
110+
osx_image: xcode12
106111
script: make test_install_manual
107112

108113
# CocoaPods Lint
109-
- name: "Test Installation Xcode 11.6 - CocoaPods Lint"
114+
- name: "Test Installation Xcode 12 - CocoaPods Lint"
110115
gemfile: .ci/gemfiles/Gemfile.travis
111-
osx_image: xcode11.6
116+
osx_image: xcode12
112117
script: make test_CocoaPodsLint_GRDB
113118

114119
# CocoaPods Install GRDB
115-
- name: "Test Installation Xcode 11.6 - CocoaPods Framework"
120+
- name: "Test Installation Xcode 12 - CocoaPods Framework"
116121
gemfile: .ci/gemfiles/Gemfile.travis
117-
osx_image: xcode11.6
122+
osx_image: xcode12
118123
script: make test_install_GRDB_CocoaPods_framework
119124

120125
# CocoaPods Install GRDB
121-
- name: "Test Installation Xcode 11.6 - CocoaPods Static"
126+
- name: "Test Installation Xcode 12 - CocoaPods Static"
122127
gemfile: .ci/gemfiles/Gemfile.travis
123-
osx_image: xcode11.6
128+
osx_image: xcode12
124129
script: make test_install_GRDB_CocoaPods_static
125130

126131
# SPM Install
127-
- name: "Test Installation Xcode 11.6 - SPM Package"
132+
- name: "Test Installation Xcode 12 - SPM Package"
128133
gemfile: .ci/gemfiles/Gemfile.travis
129-
osx_image: xcode11.6
134+
osx_image: xcode12
130135
script: make test_install_SPM_Package
131136

132137
# SPM Install
133-
- name: "Test Installation Xcode 11.6 - SPM Package in Xcode Project"
138+
- name: "Test Installation Xcode 12 - SPM Package in Xcode Project"
134139
gemfile: .ci/gemfiles/Gemfile.travis
135-
osx_image: xcode11.6
140+
osx_image: xcode12
136141
script: make test_install_SPM_Project
137142

138143
# Custom SQLite Install
139-
- name: "Test Installation Xcode 11.6 - Custom SQLite"
144+
- name: "Test Installation Xcode 12 - Custom SQLite"
140145
gemfile: .ci/gemfiles/Gemfile.travis
141-
osx_image: xcode11.6
146+
osx_image: xcode12
142147
script: make test_install_customSQLite
143148

144149
###########################################

‎CHANGELOG.md‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ All notable changes to this project will be documented in this file.
55

66
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.
77

8-
<!--
9-
[Next Release](#next-release)
10-
-->
11-
128
#### 5.x Releases
139

14-
- `5.0.x` Releases - [5.0.0](#500)
10+
<!-- - [Next Release](#next-release) -->
11+
- `5.0.x` Releases - [5.0.0](#500) | [5.0.1](#501)
1512
- `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)
1613

1714

@@ -71,6 +68,14 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
7168
- [0.110.0](#01100), ...
7269

7370

71+
## 5.0.1
72+
73+
Released September 27, 2020 &bull; [diff](https://github.com/groue/GRDB.swift/compare/v5.0.0...v5.0.1)
74+
75+
- **Fixed**: [#841](https://github.com/groue/GRDB.swift/issues/841): Fix GRDB 5 regression with indexes on expressions
76+
- The [GRDBCombineDemo](Documentation/DemoApps/GRDBCombineDemo/README.md) Combine + SwiftUI demo application was updated for the SwiftUI App lifecycle introduced in iOS 14.
77+
78+
7479
## 5.0.0
7580

7681
Released September 20, 2020 &bull; [diff](https://github.com/groue/GRDB.swift/compare/v5.0.0-beta.11...v5.0.0)

0 commit comments

Comments
 (0)