Skip to content

Commit 3efe2f9

Browse files
authored
Merge branch 'stephencelis:master' into master
2 parents 64f1a30 + a95fc6d commit 3efe2f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1859
-385
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
name: Build and test
22
on: [push, pull_request]
33
env:
4-
IOS_SIMULATOR: iPhone 12
5-
IOS_VERSION: "15.2"
4+
IOS_SIMULATOR: "iPhone 15"
5+
IOS_VERSION: "17.2"
66
jobs:
77
build:
8-
runs-on: macos-11
8+
runs-on: macos-14
99
steps:
1010
- uses: actions/checkout@v2
11-
- name: Install
11+
- name: "Select Xcode"
12+
# Currently only works with Xcode 14.2:
13+
# https://github.com/CocoaPods/CocoaPods/issues/11839
1214
run: |
13-
gem update bundler
14-
gem install xcpretty --no-document
15-
brew update
16-
brew outdated carthage || brew upgrade carthage
17-
brew outdated swiftlint || brew upgrade swiftlint
15+
xcode-select -p
16+
sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
1817
- name: "Lint"
1918
run: make lint
2019
- name: "Run tests (PACKAGE_MANAGER_COMMAND: test)"
@@ -65,6 +64,10 @@ jobs:
6564
env:
6665
CARTHAGE_PLATFORM: tvOS
6766
run: ./run-tests.sh
67+
- name: "Run tests (CARTHAGE_PLATFORM: visionOS)"
68+
env:
69+
CARTHAGE_PLATFORM: visionOS
70+
run: ./run-tests.sh
6871
build-linux:
6972
runs-on: ubuntu-latest
7073
steps:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ DerivedData
2222
# Carthage
2323
/Carthage/
2424

25+
# Makefile
26+
bin/
27+
2528
# Swift Package Manager
2629
.build
2730
Packages/
31+
.swiftpm/

.swiftlint.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
opt_in_rules:
2+
- shorthand_optional_binding
13
disabled_rules: # rule identifiers to exclude from running
24
- todo
35
- operator_whitespace
46
- large_tuple
57
- closure_parameter_position
68
- inclusive_language # sqlite_master etc.
9+
- blanket_disable_command
710
included: # paths to include during linting. `--path` is ignored if present. takes precendence over `excluded`.
811
- Sources
912
- Tests
@@ -26,8 +29,8 @@ identifier_name:
2629
- SQLITE_TRANSIENT
2730

2831
type_body_length:
29-
warning: 260
30-
error: 260
32+
warning: 350
33+
error: 350
3134

3235
function_body_length:
3336
warning: 60

CHANGELOG.md

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,50 @@
1-
0.14.0 (tbd), [diff][diff-0.14.0]
1+
0.15.3 (19-04-2024), [diff][diff-0.15.3]
22
========================================
3+
* Update `podspec` to include privacy manifest ([#1265][])
4+
5+
0.15.2 (16-04-2024), [diff][diff-0.15.2]
6+
========================================
7+
* fix: visionos to cocoapods ([#1260][])
8+
9+
0.15.1 (14-04-2024), [diff][diff-0.15.1]
10+
========================================
11+
12+
* Update CoreFunctions.swift fix typo ([#1249][])
13+
* Fix #1247 support nil case when decoding optionals ([#1248][])
14+
* Change deployment targets for Xcode 15 and add dependency on custom Cocoapods fork ([#1255][])
15+
* Add VisionOS support ([#1237][])
16+
17+
0.15.0 (24-02-2024), [diff][diff-0.15.0]
18+
========================================
19+
20+
* Fix incorrect behavior when preparing `SELECT *` preceded by a `WITH` ([#1179][])
21+
* Adds support for returning extended error codes ([#1178][])
22+
* Fix typos ([#1182][])
23+
* fix Xcode build error ([#1192][])
24+
* Make the IndexDefinition properties public ([#1196][])
25+
* Fix GitHub Actions build badge ([#1200][])
26+
* Run CI on macOS 13 ([#1206][])
27+
* SchemaReader: return the correct column definition for a composite primary key ([#1217][])
28+
* Add optional support for decoding ([#1224][])
29+
* make fromDatatypeValue throw ([#1242][])
30+
* Implements built-in window functions ([#1228][])
31+
* Fix column affinity parsing to match how SQLite determines affinity ([#1218][])
32+
* Handle FK definitions w/o key references ([#1210][])
33+
* Add privacy manifest ([#1245][])
34+
* New minimum deployment targets: iOS/tvOS 11.0, watchOS 4.0
35+
36+
0.14.1 (01-11-2022), [diff][diff-0.14.1]
37+
========================================
38+
39+
* Reverted `Blob` changes (See [#1167][] for rationale).
40+
41+
0.14.0 (27-10-2022), [diff][diff-0.14.0]
42+
========================================
43+
For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
344

445
* Support more complex schema changes and queries ([#1073][], [#1146][] [#1148][])
546
* Support `ATTACH`/`DETACH` ([#30][], [#1142][])
47+
* Expose connection flags (via `URIQueryParameter`) to open db ([#1074][])
648
* Support `WITH` clause ([#1139][])
749
* Add `Value` conformance for `NSURL` ([#1110][], [#1141][])
850
* Add decoding for `UUID` ([#1137][])
@@ -127,6 +169,10 @@
127169
[diff-0.13.2]: https://github.com/stephencelis/SQLite.swift/compare/0.13.1...0.13.2
128170
[diff-0.13.3]: https://github.com/stephencelis/SQLite.swift/compare/0.13.2...0.13.3
129171
[diff-0.14.0]: https://github.com/stephencelis/SQLite.swift/compare/0.13.3...0.14.0
172+
[diff-0.14.1]: https://github.com/stephencelis/SQLite.swift/compare/0.14.0...0.14.1
173+
[diff-0.15.0]: https://github.com/stephencelis/SQLite.swift/compare/0.14.0...0.15.0
174+
[diff-0.15.1]: https://github.com/stephencelis/SQLite.swift/compare/0.15.0...0.15.1
175+
[diff-0.15.2]: https://github.com/stephencelis/SQLite.swift/compare/0.15.1...0.15.2
130176

131177
[#30]: https://github.com/stephencelis/SQLite.swift/issues/30
132178
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142
@@ -164,6 +210,7 @@
164210
[#881]: https://github.com/stephencelis/SQLite.swift/pull/881
165211
[#919]: https://github.com/stephencelis/SQLite.swift/pull/919
166212
[#1073]: https://github.com/stephencelis/SQLite.swift/issues/1073
213+
[#1074]: https://github.com/stephencelis/SQLite.swift/issues/1074
167214
[#1075]: https://github.com/stephencelis/SQLite.swift/pull/1075
168215
[#1077]: https://github.com/stephencelis/SQLite.swift/issues/1077
169216
[#1094]: https://github.com/stephencelis/SQLite.swift/pull/1094
@@ -192,3 +239,23 @@
192239
[#1146]: https://github.com/stephencelis/SQLite.swift/pull/1146
193240
[#1148]: https://github.com/stephencelis/SQLite.swift/pull/1148
194241
[#1167]: https://github.com/stephencelis/SQLite.swift/pull/1167
242+
[#1179]: https://github.com/stephencelis/SQLite.swift/pull/1179
243+
[#1178]: https://github.com/stephencelis/SQLite.swift/pull/1178
244+
[#1182]: https://github.com/stephencelis/SQLite.swift/pull/1182
245+
[#1192]: https://github.com/stephencelis/SQLite.swift/pull/1192
246+
[#1196]: https://github.com/stephencelis/SQLite.swift/pull/1196
247+
[#1200]: https://github.com/stephencelis/SQLite.swift/pull/1200
248+
[#1206]: https://github.com/stephencelis/SQLite.swift/pull/1206
249+
[#1217]: https://github.com/stephencelis/SQLite.swift/pull/1217
250+
[#1224]: https://github.com/stephencelis/SQLite.swift/pull/1224
251+
[#1242]: https://github.com/stephencelis/SQLite.swift/pull/1242
252+
[#1228]: https://github.com/stephencelis/SQLite.swift/pull/1228
253+
[#1218]: https://github.com/stephencelis/SQLite.swift/pull/1218
254+
[#1210]: https://github.com/stephencelis/SQLite.swift/pull/1210
255+
[#1245]: https://github.com/stephencelis/SQLite.swift/pull/1245
256+
[#1249]: https://github.com/stephencelis/SQLite.swift/pull/1249
257+
[#1248]: https://github.com/stephencelis/SQLite.swift/pull/1248
258+
[#1255]: https://github.com/stephencelis/SQLite.swift/pull/1255
259+
[#1237]: https://github.com/stephencelis/SQLite.swift/pull/1237
260+
[#1260]: https://github.com/stephencelis/SQLite.swift/pull/1260
261+
[#1265]: https://github.com/stephencelis/SQLite.swift/pull/1265

0 commit comments

Comments
 (0)