Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ opt_in_rules:
- shorthand_optional_binding
disabled_rules: # rule identifiers to exclude from running
- todo
- operator_whitespace
- function_name_whitespace
- large_tuple
- closure_parameter_position
- inclusive_language # sqlite_master etc.
Expand All @@ -12,7 +12,7 @@ included: # paths to include during linting. `--path` is ignored if present. tak
- Tests
- Package.swift
excluded: # paths to ignore during linting. overridden by `included`.
- .build
- "*/.build/*"

identifier_name:
excluded:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.15.5 (tbd), [diff][diff-0.15.5]
0.15.5 (22-01-2025), [diff][diff-0.15.5]
========================================
* Support more package traits ([#1341][]), including FTS5 ([#1343][])
* SQLCipher package manager integration ([#1336][], [#1340][])
Expand Down Expand Up @@ -189,6 +189,7 @@ For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
[diff-0.15.2]: https://github.com/stephencelis/SQLite.swift/compare/0.15.1...0.15.2
[diff-0.15.3]: https://github.com/stephencelis/SQLite.swift/compare/0.15.2...0.15.3
[diff-0.15.4]: https://github.com/stephencelis/SQLite.swift/compare/0.15.3...0.15.4
[diff-0.15.5]: https://github.com/stephencelis/SQLite.swift/compare/0.15.4...0.15.5

[#30]: https://github.com/stephencelis/SQLite.swift/issues/30
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142
Expand Down
32 changes: 16 additions & 16 deletions Documentation/Index.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ process of downloading, compiling, and linking dependencies.

```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4")
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5")
]
```

Expand All @@ -127,19 +127,19 @@ SQLite.swift for different use cases.
```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git",
from: "0.15.4",
from: "0.15.5",
traits: ["XXX"])
]
```

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

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

```swift
depdencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4", traits: ["SQLCipher"])
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5", traits: ["SQLCipher"])
]
```

Expand Down Expand Up @@ -181,7 +181,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/stephencelis/SQLite.swift.git",
from: "0.15.4",
from: "0.15.5",
traits: ["SQLCipher"])
],
targets: [
Expand Down Expand Up @@ -228,7 +228,7 @@ install SQLite.swift with Carthage:
2. Update your Cartfile to include the following:

```ruby
github "stephencelis/SQLite.swift" ~> 0.15.4
github "stephencelis/SQLite.swift" ~> 0.15.5
```

3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
Expand Down Expand Up @@ -258,7 +258,7 @@ install SQLite.swift with Carthage:
use_frameworks!

target 'YourAppTargetName' do
pod 'SQLite.swift', '~> 0.15.4'
pod 'SQLite.swift', '~> 0.15.5'
end
```

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

```ruby
target 'YourAppTargetName' do
pod 'SQLite.swift/standalone', '~> 0.15.4'
pod 'SQLite.swift/standalone', '~> 0.15.5'
end
```

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

```ruby
target 'YourAppTargetName' do
pod 'SQLite.swift/standalone', '~> 0.15.4'
pod 'SQLite.swift/standalone', '~> 0.15.5'
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
end
```
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ embed SQLite:
```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git",
from: "0.15.4",
from: "0.15.5",
traits: ["SwiftToolchainCSQLite"])
]
```
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IOS_SIMULATOR = iPhone 14
IOS_VERSION = 16.4

# tool settings
SWIFTLINT_VERSION=0.52.2
SWIFTLINT_VERSION=0.63.1
SWIFTLINT=bin/swiftlint-$(SWIFTLINT_VERSION)
SWIFTLINT_URL=https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/portable_swiftlint.zip
XCBEAUTIFY_VERSION=3.1.2
Expand Down
4 changes: 1 addition & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/swiftlang/swift-toolchain-sqlite", from: "1.0.7"),
.package(url: "https://github.com/stephencelis/CSQLite",
branch: "SQLite.swift",
traits: [.trait(name: "FTS5", condition: .when(traits: ["FTS5"]))]),
.package(url: "https://github.com/stephencelis/CSQLite", from: "3.50.4", traits: [.trait(name: "FTS5", condition: .when(traits: ["FTS5"]))]),
.package(url: "https://github.com/sqlcipher/SQLCipher.swift", from: "4.11.0")
],
targets: [target, testTarget],
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Swift code.

```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4")
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5")
]
```

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

```ruby
github "stephencelis/SQLite.swift" ~> 0.15.4
github "stephencelis/SQLite.swift" ~> 0.15.5
```

3. Run `carthage update` and
Expand Down
2 changes: 1 addition & 1 deletion SQLite.swift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SQLite.swift"
s.version = "0.15.4"
s.version = "0.15.5"
s.summary = "A type-safe, Swift-language layer over SQLite3."

s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions SQLite.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.15.4;
MARKETING_VERSION = 0.15.5;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "";
Expand Down Expand Up @@ -1832,7 +1832,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.15.4;
MARKETING_VERSION = 0.15.5;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "";
SDKROOT = iphoneos;
Expand Down
4 changes: 1 addition & 3 deletions Sources/SQLite/Typed/Operators.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//

// TODO: use `@warn_unused_result` by the time operator functions support it

// swiftlint:disable file_length
private enum Operator: String, Sendable {
case plus = "+"
case minus = "-"
Expand Down
1 change: 1 addition & 0 deletions Sources/SQLite/Typed/Query.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// swiftlint:disable file_length
import Foundation

public protocol QueryType: Expressible {
Expand Down
2 changes: 0 additions & 2 deletions Tests/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
parent_config: ../.swiftlint.yml

disabled_rules:
- force_cast
- force_try
Expand Down
2 changes: 1 addition & 1 deletion Tests/SPM/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let package = Package(
// for testing from same repository
.package(path: "../..", traits: traits)
// normally this would be:
// .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4")
// .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5")
],
targets: [
.executableTarget(name: "test", dependencies: [.product(name: "SQLite", package: "SQLite.swift")])
Expand Down
Loading