Skip to content

Fix compilation on Linux #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jberkel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compilation on Linux #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ jobs:
run: |
sudo apt-get update -qq
sudo apt-get install -y libsqlite3-dev
- name: Test
- name: Test (default trait)
run: swift test
- name: Test (SwiftToolchainCSQLite)
run: swift test --traits SwiftToolchainCSQLite
- name: "Run tests (SPM integration test)"
env:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.15.6 (28-01-2026), [diff][diff-0.15.6]
========================================
* Revert trait changes for Linux

0.15.5 (22-01-2026), [diff][diff-0.15.5]
========================================
* Support more package traits ([#1341][]), including FTS5 ([#1343][])
Expand Down Expand Up @@ -190,6 +194,7 @@ For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
[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
[diff-0.15.6]: https://github.com/stephencelis/SQLite.swift/compare/0.15.5...0.15.6

[#30]: https://github.com/stephencelis/SQLite.swift/issues/30
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142
Expand Down
16 changes: 8 additions & 8 deletions Documentation/Index.md
View file
Open in desktop
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.5")
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.6")
]
```

Expand All @@ -127,7 +127,7 @@ SQLite.swift for different use cases.
```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git",
from: "0.15.5",
from: "0.15.6",
traits: ["XXX"])
]
```
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.5", traits: ["SQLCipher"])
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.6", 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.5",
from: "0.15.6",
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.5
github "stephencelis/SQLite.swift" ~> 0.15.6
```

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.5'
pod 'SQLite.swift', '~> 0.15.6'
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.5'
pod 'SQLite.swift/standalone', '~> 0.15.6'
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.5'
pod 'SQLite.swift/standalone', '~> 0.15.6'
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
View file
Open in desktop
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.5",
from: "0.15.6",
traits: ["SwiftToolchainCSQLite"])
]
```
Expand Down
9 changes: 8 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ let testTarget: Target = .testTarget(
resources: [.copy("Resources")]
)

let defaultTraits: Set<String>
#if os(Linux)
defaultTraits = ["SwiftToolchainCSQLite"]
#else
defaultTraits = ["SystemSQLite"]
#endif

let package = Package(
name: "SQLite.swift",
platforms: [
Expand Down Expand Up @@ -56,7 +63,7 @@ let package = Package(
description: "Enables SQLCipher encryption when a key is supplied to Connection"),
.trait(name: "FTS5",
description: "Enables FTS5 in the embedded SQLite (only supported by SQLiteSwiftCSQLite)"),
.default(enabledTraits: ["SystemSQLite"])
.default(enabledTraits: defaultTraits)
],
dependencies: [
.package(url: "https://github.com/swiftlang/swift-toolchain-sqlite", from: "1.0.7"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
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.5")
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.6")
]
```

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.5
github "stephencelis/SQLite.swift" ~> 0.15.6
```

3. Run `carthage update` and
Expand Down
2 changes: 1 addition & 1 deletion SQLite.swift.podspec
View file
Open in desktop
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.5"
s.version = "0.15.6"
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
View file
Open in desktop
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.5;
MARKETING_VERSION = 0.15.6;
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.5;
MARKETING_VERSION = 0.15.6;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "";
SDKROOT = iphoneos;
Expand Down
11 changes: 2 additions & 9 deletions Tests/SPM/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@

import PackageDescription

let traits: Set<Package.Dependency.Trait>
#if os(Linux)
traits = ["SwiftToolchainCSQLite"]
#else
traits = [.defaults]
#endif

let package = Package(
name: "test",
platforms: [
Expand All @@ -20,9 +13,9 @@ let package = Package(
],
dependencies: [
// for testing from same repository
.package(path: "../..", traits: traits)
.package(path: "../..")
// normally this would be:
// .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.5")
// .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.6")
],
targets: [
.executableTarget(name: "test", dependencies: [.product(name: "SQLite", package: "SQLite.swift")])
Expand Down
Loading