Merge pull request stephencelis#1318 from ha100/master

fix cross compilation for linux on macOS fails stephencelis#1317

Author: nathanfallet

Package.swift

@@ -1,6 +1,38 @@
 // swift-tools-version:5.9
 import PackageDescription
 
+let deps: [Package.Dependency] = [
+    .github("swiftlang/swift-toolchain-sqlite", exact: "1.0.4")
+]
+
+let targets: [Target] = [
+    .target(
+        name: "SQLite",
+        dependencies: [
+            .product(name: "SwiftToolchainCSQLite", package: "swift-toolchain-sqlite", condition: .when(platforms: [.linux, .windows]))
+        ],
+        exclude: [
+            "Info.plist"
+        ]
+    )
+]
+
+let testTargets: [Target] = [
+    .testTarget(
+        name: "SQLiteTests",
+        dependencies: [
+            "SQLite"
+        ],
+        path: "Tests/SQLiteTests",
+        exclude: [
+            "Info.plist"
+        ],
+        resources: [
+            .copy("Resources")
+        ]
+    )
+]
+
 let package = Package(
     name: "SQLite.swift",
     platforms: [
@@ -16,34 +48,13 @@ let package = Package(
             targets: ["SQLite"]
         )
     ],
-    targets: [
-        .target(
-            name: "SQLite",
-            exclude: [
-                "Info.plist"
-            ]
-        ),
-        .testTarget(
-            name: "SQLiteTests",
-            dependencies: [
-                "SQLite"
-            ],
-            path: "Tests/SQLiteTests",
-            exclude: [
-                "Info.plist"
-            ],
-            resources: [
-                .copy("Resources")
-            ]
-        )
-    ]
+    dependencies: deps,
+    targets: targets + testTargets
 )
 
-#if os(Linux)
-package.dependencies = [
-    .package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")
-]
-package.targets.first?.dependencies += [
-    .product(name: "CSQLite", package: "CSQLite")
-]
-#endif
+extension Package.Dependency {
+
+    static func github(_ repo: String, exact ver: Version) -> Package.Dependency {
+        .package(url: "https://github.com/\(repo)", exact: ver)
+    }
+}

Sources/SQLite/Core/Backup.swift

@@ -29,7 +29,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Sources/SQLite/Core/Connection+Aggregation.swift

@@ -4,7 +4,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Sources/SQLite/Core/Connection+Attach.swift

@@ -4,7 +4,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Sources/SQLite/Core/Connection.swift

@@ -29,7 +29,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Sources/SQLite/Core/Result.swift

@@ -3,7 +3,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Sources/SQLite/Core/Statement.swift

@@ -27,7 +27,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Sources/SQLite/Helpers.swift

@@ -27,7 +27,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Tests/SQLiteTests/Core/Connection+AttachTests.swift

@@ -7,7 +7,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif

Tests/SQLiteTests/Core/Connection+PragmaTests.swift

@@ -7,7 +7,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #elseif os(Linux)
-import CSQLite
+import SwiftToolchainCSQLite
 #else
 import SQLite3
 #endif