Skip to content

Commit 8938697

committed

change CSQLite dep to SwiftToolchainCSQLite to allow swift sdk cross compilation

1 parent c7b78f2 commit 8938697Copy full SHA for 8938697

File tree

17 files changed

+56

-45

lines changed

Package.swift
Sources/SQLite
- Core
- Helpers.swift
Tests/SQLiteTests

17 files changed

+56

-45

lines changed

`‎Package.swift‎`

Lines changed: 40 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,38 @@`
`1`	`1`	`// swift-tools-version:5.9`
`2`	`2`	`import PackageDescription`
`3`	`3`
	`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")`
	`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`	`+`
`4`	`36`	`let package = Package(`
`5`	`37`	`name: "SQLite.swift",`
`6`	`38`	`platforms: [`
`@@ -16,34 +48,13 @@ let package = Package(`
`16`	`48`	`targets: ["SQLite"]`
`17`	`49`	`)`
`18`	`50`	`],`
`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`
`40`	`53`	`)`
`41`	`54`
`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 number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import sqlite3`
`29`	`29`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`30`	`30`	`import SQLCipher`
`31`	`31`	`#elseif os(Linux)`
`32`		`-import CSQLite`
	`32`	`+import SwiftToolchainCSQLite`
`33`	`33`	`#else`
`34`	`34`	`import SQLite3`
`35`	`35`	`#endif`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import sqlite3`
`4`	`4`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`5`	`5`	`import SQLCipher`
`6`	`6`	`#elseif os(Linux)`
`7`		`-import CSQLite`
	`7`	`+import SwiftToolchainCSQLite`
`8`	`8`	`#else`
`9`	`9`	`import SQLite3`
`10`	`10`	`#endif`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import sqlite3`
`4`	`4`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`5`	`5`	`import SQLCipher`
`6`	`6`	`#elseif os(Linux)`
`7`		`-import CSQLite`
	`7`	`+import SwiftToolchainCSQLite`
`8`	`8`	`#else`
`9`	`9`	`import SQLite3`
`10`	`10`	`#endif`

`‎Sources/SQLite/Core/Connection.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import sqlite3`
`29`	`29`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`30`	`30`	`import SQLCipher`
`31`	`31`	`#elseif os(Linux)`
`32`		`-import CSQLite`
	`32`	`+import SwiftToolchainCSQLite`
`33`	`33`	`#else`
`34`	`34`	`import SQLite3`
`35`	`35`	`#endif`

`‎Sources/SQLite/Core/Result.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import sqlite3`
`3`	`3`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`4`	`4`	`import SQLCipher`
`5`	`5`	`#elseif os(Linux)`
`6`		`-import CSQLite`
	`6`	`+import SwiftToolchainCSQLite`
`7`	`7`	`#else`
`8`	`8`	`import SQLite3`
`9`	`9`	`#endif`

`‎Sources/SQLite/Core/Statement.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import sqlite3`
`27`	`27`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`28`	`28`	`import SQLCipher`
`29`	`29`	`#elseif os(Linux)`
`30`		`-import CSQLite`
	`30`	`+import SwiftToolchainCSQLite`
`31`	`31`	`#else`
`32`	`32`	`import SQLite3`
`33`	`33`	`#endif`

`‎Sources/SQLite/Helpers.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import sqlite3`
`27`	`27`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`28`	`28`	`import SQLCipher`
`29`	`29`	`#elseif os(Linux)`
`30`		`-import CSQLite`
	`30`	`+import SwiftToolchainCSQLite`
`31`	`31`	`#else`
`32`	`32`	`import SQLite3`
`33`	`33`	`#endif`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import sqlite3`
`7`	`7`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`8`	`8`	`import SQLCipher`
`9`	`9`	`#elseif os(Linux)`
`10`		`-import CSQLite`
	`10`	`+import SwiftToolchainCSQLite`
`11`	`11`	`#else`
`12`	`12`	`import SQLite3`
`13`	`13`	`#endif`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import sqlite3`
`7`	`7`	`#elseif SQLITE_SWIFT_SQLCIPHER`
`8`	`8`	`import SQLCipher`
`9`	`9`	`#elseif os(Linux)`
`10`		`-import CSQLite`
	`10`	`+import SwiftToolchainCSQLite`
`11`	`11`	`#else`
`12`	`12`	`import SQLite3`
`13`	`13`	`#endif`

0 commit comments

Comments

(0)