Skip to content

Commit 43eb040

Browse files
nathanfalletnathanfallet
authored
Merge pull request #1318 from ha100/master
fix cross compilation for linux on macOS fails #1317
2 parents c7b78f2 + fc774a2 commit 43eb040

17 files changed

+56
-45
lines changed

‎Package.swift

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
// swift-tools-version:5.9
22
import PackageDescription
33

4+
let deps: [Package.Dependency] = [
5+
.github("swiftlang/swift-toolchain-sqlite", exact: "1.0.4")
6+
]
7+
8+
let targets: [Target] = [
9+
.target(
10+
name: "SQLite",
11+
dependencies: [
12+
.product(name: "SwiftToolchainCSQLite", package: "swift-toolchain-sqlite", condition: .when(platforms: [.linux, .windows]))
13+
],
14+
exclude: [
15+
"Info.plist"
16+
]
17+
)
18+
]
19+
20+
let testTargets: [Target] = [
21+
.testTarget(
22+
name: "SQLiteTests",
23+
dependencies: [
24+
"SQLite"
25+
],
26+
path: "Tests/SQLiteTests",
27+
exclude: [
28+
"Info.plist"
29+
],
30+
resources: [
31+
.copy("Resources")
32+
]
33+
)
34+
]
35+
436
let package = Package(
537
name: "SQLite.swift",
638
platforms: [
@@ -16,34 +48,13 @@ let package = Package(
1648
targets: ["SQLite"]
1749
)
1850
],
19-
targets: [
20-
.target(
21-
name: "SQLite",
22-
exclude: [
23-
"Info.plist"
24-
]
25-
),
26-
.testTarget(
27-
name: "SQLiteTests",
28-
dependencies: [
29-
"SQLite"
30-
],
31-
path: "Tests/SQLiteTests",
32-
exclude: [
33-
"Info.plist"
34-
],
35-
resources: [
36-
.copy("Resources")
37-
]
38-
)
39-
]
51+
dependencies: deps,
52+
targets: targets + testTargets
4053
)
4154

42-
#if os(Linux)
43-
package.dependencies = [
44-
.package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")
45-
]
46-
package.targets.first?.dependencies += [
47-
.product(name: "CSQLite", package: "CSQLite")
48-
]
49-
#endif
55+
extension Package.Dependency {
56+
57+
static func github(_ repo: String, exact ver: Version) -> Package.Dependency {
58+
.package(url: "https://github.com/\(repo)", exact: ver)
59+
}
60+
}

‎Sources/SQLite/Core/Backup.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import sqlite3
2929
#elseif SQLITE_SWIFT_SQLCIPHER
3030
import SQLCipher
3131
#elseif os(Linux)
32-
import CSQLite
32+
import SwiftToolchainCSQLite
3333
#else
3434
import SQLite3
3535
#endif

‎Sources/SQLite/Core/Connection+Aggregation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sqlite3
44
#elseif SQLITE_SWIFT_SQLCIPHER
55
import SQLCipher
66
#elseif os(Linux)
7-
import CSQLite
7+
import SwiftToolchainCSQLite
88
#else
99
import SQLite3
1010
#endif

‎Sources/SQLite/Core/Connection+Attach.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sqlite3
44
#elseif SQLITE_SWIFT_SQLCIPHER
55
import SQLCipher
66
#elseif os(Linux)
7-
import CSQLite
7+
import SwiftToolchainCSQLite
88
#else
99
import SQLite3
1010
#endif

‎Sources/SQLite/Core/Connection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import sqlite3
2929
#elseif SQLITE_SWIFT_SQLCIPHER
3030
import SQLCipher
3131
#elseif os(Linux)
32-
import CSQLite
32+
import SwiftToolchainCSQLite
3333
#else
3434
import SQLite3
3535
#endif

‎Sources/SQLite/Core/Result.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sqlite3
33
#elseif SQLITE_SWIFT_SQLCIPHER
44
import SQLCipher
55
#elseif os(Linux)
6-
import CSQLite
6+
import SwiftToolchainCSQLite
77
#else
88
import SQLite3
99
#endif

‎Sources/SQLite/Core/Statement.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import sqlite3
2727
#elseif SQLITE_SWIFT_SQLCIPHER
2828
import SQLCipher
2929
#elseif os(Linux)
30-
import CSQLite
30+
import SwiftToolchainCSQLite
3131
#else
3232
import SQLite3
3333
#endif

‎Sources/SQLite/Helpers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import sqlite3
2727
#elseif SQLITE_SWIFT_SQLCIPHER
2828
import SQLCipher
2929
#elseif os(Linux)
30-
import CSQLite
30+
import SwiftToolchainCSQLite
3131
#else
3232
import SQLite3
3333
#endif

‎Tests/SQLiteTests/Core/Connection+AttachTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import sqlite3
77
#elseif SQLITE_SWIFT_SQLCIPHER
88
import SQLCipher
99
#elseif os(Linux)
10-
import CSQLite
10+
import SwiftToolchainCSQLite
1111
#else
1212
import SQLite3
1313
#endif

‎Tests/SQLiteTests/Core/Connection+PragmaTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import sqlite3
77
#elseif SQLITE_SWIFT_SQLCIPHER
88
import SQLCipher
99
#elseif os(Linux)
10-
import CSQLite
10+
import SwiftToolchainCSQLite
1111
#else
1212
import SQLite3
1313
#endif

‎Tests/SQLiteTests/Core/ConnectionTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import sqlite3
88
#elseif SQLITE_SWIFT_SQLCIPHER
99
import SQLCipher
1010
#elseif os(Linux)
11-
import CSQLite
11+
import SwiftToolchainCSQLite
1212
#else
1313
import SQLite3
1414
#endif

‎Tests/SQLiteTests/Core/ResultTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import sqlite3
77
#elseif SQLITE_SWIFT_SQLCIPHER
88
import SQLCipher
99
#elseif os(Linux)
10-
import CSQLite
10+
import SwiftToolchainCSQLite
1111
#else
1212
import SQLite3
1313
#endif

‎Tests/SQLiteTests/Core/StatementTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import sqlite3
66
#elseif SQLITE_SWIFT_SQLCIPHER
77
import SQLCipher
88
#elseif os(Linux)
9-
import CSQLite
9+
import SwiftToolchainCSQLite
1010
#else
1111
import SQLite3
1212
#endif

‎Tests/SQLiteTests/Extensions/FTSIntegrationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sqlite3
44
#elseif SQLITE_SWIFT_SQLCIPHER
55
import SQLCipher
66
#elseif os(Linux)
7-
import CSQLite
7+
import SwiftToolchainCSQLite
88
#else
99
import SQLite3
1010
#endif

‎Tests/SQLiteTests/Typed/CustomAggregationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import sqlite3
88
#elseif SQLITE_SWIFT_SQLCIPHER
99
import SQLCipher
1010
#elseif os(Linux)
11-
import CSQLite
11+
import SwiftToolchainCSQLite
1212
#else
1313
import SQLite3
1414
#endif

‎Tests/SQLiteTests/Typed/QueryIntegrationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sqlite3
44
#elseif SQLITE_SWIFT_SQLCIPHER
55
import SQLCipher
66
#elseif os(Linux)
7-
import CSQLite
7+
import SwiftToolchainCSQLite
88
#else
99
import SQLite3
1010
#endif

‎Tests/SQLiteTests/Typed/QueryTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sqlite3
44
#elseif SQLITE_SWIFT_SQLCIPHER
55
import SQLCipher
66
#elseif os(Linux)
7-
import CSQLite
7+
import SwiftToolchainCSQLite
88
#else
99
import SQLite3
1010
#endif

0 commit comments

Comments
 (0)