Skip to content

Commit 0c08856

Browse files
jberkeljberkel
authored
Merge pull request #1345 from stephencelis/prepare-release
Prepare release
2 parents 8ef3926 + 307667a commit 0c08856

13 files changed

Lines changed: 31 additions & 35 deletions

File tree

‎.swiftlint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ opt_in_rules:
22
- shorthand_optional_binding
33
disabled_rules: # rule identifiers to exclude from running
44
- todo
5-
- operator_whitespace
5+
- function_name_whitespace
66
- large_tuple
77
- closure_parameter_position
88
- inclusive_language # sqlite_master etc.
@@ -12,7 +12,7 @@ included: # paths to include during linting. `--path` is ignored if present. tak
1212
- Tests
1313
- Package.swift
1414
excluded: # paths to ignore during linting. overridden by `included`.
15-
- .build
15+
- "*/.build/*"
1616

1717
identifier_name:
1818
excluded:

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
0.15.5 (tbd), [diff][diff-0.15.5]
1+
0.15.5 (22-01-2025), [diff][diff-0.15.5]
22
========================================
33
* Support more package traits ([#1341][]), including FTS5 ([#1343][])
44
* SQLCipher package manager integration ([#1336][], [#1340][])
@@ -189,6 +189,7 @@ For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
189189
[diff-0.15.2]: https://github.com/stephencelis/SQLite.swift/compare/0.15.1...0.15.2
190190
[diff-0.15.3]: https://github.com/stephencelis/SQLite.swift/compare/0.15.2...0.15.3
191191
[diff-0.15.4]: https://github.com/stephencelis/SQLite.swift/compare/0.15.3...0.15.4
192+
[diff-0.15.5]: https://github.com/stephencelis/SQLite.swift/compare/0.15.4...0.15.5
192193

193194
[#30]: https://github.com/stephencelis/SQLite.swift/issues/30
194195
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142

‎Documentation/Index.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ process of downloading, compiling, and linking dependencies.
109109

110110
```swift
111111
dependencies: [
112-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4")
112+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5")
113113
]
114114
```
115115

@@ -127,19 +127,19 @@ SQLite.swift for different use cases.
127127
```swift
128128
dependencies: [
129129
.package(url: "https://github.com/stephencelis/SQLite.swift.git",
130-
from: "0.15.4",
130+
from: "0.15.5",
131131
traits: ["XXX"])
132132
]
133133
```
134134

135-
| Trait | Description |
136-
|--------------------------|-----------------------------------------------------|
137-
| `SystemSQLite` (default) | Uses the system SQLite (provided by Apple) |
138-
| `SwiftToolchainCSQLite` | Embeds the SQLite provided by [swift-toolchain][] |
139-
| `SQLiteSwiftCSQLite` | Embeds a [custom SQLite][] based on swift-toolchain |
140-
| `StandaloneSQLite` | Only used by CocoaPods |
141-
| `SQLCipher` | Embeds [SQLCipher][] (see below) |
142-
| `FTS5` | Enables FTS5, only works with `SQLiteSwiftCSQLite` |
135+
| Trait | Description | SQLite version |
136+
|--------------------------|-----------------------------------------------------|--------------------------------------|
137+
| `SystemSQLite` (default) | Uses the system SQLite (provided by Apple) | macOS 15.7.x: `3.43.2`, 26: `3.50.2` |
138+
| `SwiftToolchainCSQLite` | Embeds the SQLite provided by [swift-toolchain][] | 1.0.7: `3.50.4` |
139+
| `SQLiteSwiftCSQLite` | Embeds a [custom SQLite][] based on swift-toolchain | `3.50.4` |
140+
| `StandaloneSQLite` | Only used by CocoaPods | |
141+
| `SQLCipher` | Embeds [SQLCipher][] (see below) | 4.13.0: `3.51.2` |
142+
| `FTS5` | Enables FTS5, only works with `SQLiteSwiftCSQLite` | |
143143

144144
[traits]: https://docs.swift.org/swiftpm/documentation/packagemanagerdocs/packagetraits/
145145
[custom SQLite]: https://github.com/stephencelis/CSQLite/tree/SQLite.swift
@@ -151,7 +151,7 @@ If you want to use [SQLCipher][] with SQLite.swift you can specify the `SQLCiphe
151151

152152
```swift
153153
depdencies: [
154-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4", traits: ["SQLCipher"])
154+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5", traits: ["SQLCipher"])
155155
]
156156
```
157157

@@ -181,7 +181,7 @@ let package = Package(
181181
dependencies: [
182182
.package(
183183
url: "https://github.com/stephencelis/SQLite.swift.git",
184-
from: "0.15.4",
184+
from: "0.15.5",
185185
traits: ["SQLCipher"])
186186
],
187187
targets: [
@@ -228,7 +228,7 @@ install SQLite.swift with Carthage:
228228
2. Update your Cartfile to include the following:
229229

230230
```ruby
231-
github "stephencelis/SQLite.swift" ~> 0.15.4
231+
github "stephencelis/SQLite.swift" ~> 0.15.5
232232
```
233233

234234
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -258,7 +258,7 @@ install SQLite.swift with Carthage:
258258
use_frameworks!
259259
260260
target 'YourAppTargetName' do
261-
pod 'SQLite.swift', '~> 0.15.4'
261+
pod 'SQLite.swift', '~> 0.15.5'
262262
end
263263
```
264264

@@ -272,7 +272,7 @@ with the OS you can require the `standalone` subspec:
272272

273273
```ruby
274274
target 'YourAppTargetName' do
275-
pod 'SQLite.swift/standalone', '~> 0.15.4'
275+
pod 'SQLite.swift/standalone', '~> 0.15.5'
276276
end
277277
```
278278

@@ -282,7 +282,7 @@ dependency to sqlite3 or one of its subspecs:
282282

283283
```ruby
284284
target 'YourAppTargetName' do
285-
pod 'SQLite.swift/standalone', '~> 0.15.4'
285+
pod 'SQLite.swift/standalone', '~> 0.15.5'
286286
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
287287
end
288288
```

‎Documentation/Linux.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ embed SQLite:
1313
```swift
1414
dependencies: [
1515
.package(url: "https://github.com/stephencelis/SQLite.swift.git",
16-
from: "0.15.4",
16+
from: "0.15.5",
1717
traits: ["SwiftToolchainCSQLite"])
1818
]
1919
```

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ IOS_SIMULATOR = iPhone 14
44
IOS_VERSION = 16.4
55

66
# tool settings
7-
SWIFTLINT_VERSION=0.52.2
7+
SWIFTLINT_VERSION=0.63.1
88
SWIFTLINT=bin/swiftlint-$(SWIFTLINT_VERSION)
99
SWIFTLINT_URL=https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/portable_swiftlint.zip
1010
XCBEAUTIFY_VERSION=3.1.2

‎Package.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ let package = Package(
6060
],
6161
dependencies: [
6262
.package(url: "https://github.com/swiftlang/swift-toolchain-sqlite", from: "1.0.7"),
63-
.package(url: "https://github.com/stephencelis/CSQLite",
64-
branch: "SQLite.swift",
65-
traits: [.trait(name: "FTS5", condition: .when(traits: ["FTS5"]))]),
63+
.package(url: "https://github.com/stephencelis/CSQLite", from: "3.50.4", traits: [.trait(name: "FTS5", condition: .when(traits: ["FTS5"]))]),
6664
.package(url: "https://github.com/sqlcipher/SQLCipher.swift", from: "4.11.0")
6765
],
6866
targets: [target, testTarget],

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Swift code.
131131

132132
```swift
133133
dependencies: [
134-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4")
134+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5")
135135
]
136136
```
137137

@@ -155,7 +155,7 @@ install SQLite.swift with Carthage:
155155
2. Update your Cartfile to include the following:
156156

157157
```ruby
158-
github "stephencelis/SQLite.swift" ~> 0.15.4
158+
github "stephencelis/SQLite.swift" ~> 0.15.5
159159
```
160160

161161
3. Run `carthage update` and

‎SQLite.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 = "SQLite.swift"
3-
s.version = "0.15.4"
3+
s.version = "0.15.5"
44
s.summary = "A type-safe, Swift-language layer over SQLite3."
55

66
s.description = <<-DESC

‎SQLite.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,7 @@
17721772
GCC_WARN_UNUSED_VARIABLE = YES;
17731773
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
17741774
MACOSX_DEPLOYMENT_TARGET = 10.13;
1775-
MARKETING_VERSION = 0.15.4;
1775+
MARKETING_VERSION = 0.15.5;
17761776
MTL_ENABLE_DEBUG_INFO = YES;
17771777
ONLY_ACTIVE_ARCH = YES;
17781778
PRODUCT_NAME = "";
@@ -1832,7 +1832,7 @@
18321832
GCC_WARN_UNUSED_VARIABLE = YES;
18331833
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
18341834
MACOSX_DEPLOYMENT_TARGET = 10.13;
1835-
MARKETING_VERSION = 0.15.4;
1835+
MARKETING_VERSION = 0.15.5;
18361836
MTL_ENABLE_DEBUG_INFO = NO;
18371837
PRODUCT_NAME = "";
18381838
SDKROOT = iphoneos;

‎Sources/SQLite/Typed/Operators.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
// THE SOFTWARE.
2323
//
24-
25-
// TODO: use `@warn_unused_result` by the time operator functions support it
26-
24+
// swiftlint:disable file_length
2725
private enum Operator: String, Sendable {
2826
case plus = "+"
2927
case minus = "-"

0 commit comments

Comments
 (0)