[BREAKING] Rename CSQLite to GRDBSQLite

Fix #1528
This commit is contained in:
Gwendal Roué committed 2024-08-24 18:15:57 +02:00
1 parent 9cd1d849cc
commit 9e1ff42249
51 files changed
+51 -185

No files matched your search

@@ -1,134 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1410"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GRDB_GRDBTests"
BuildableName = "GRDB_GRDBTests"
BlueprintName = "GRDB_GRDBTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GRDB"
BuildableName = "GRDB"
BlueprintName = "GRDB"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GRDB-dynamic"
BuildableName = "GRDB-dynamic"
BlueprintName = "GRDB-dynamic"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GRDBTests"
BuildableName = "GRDBTests"
BlueprintName = "GRDBTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CSQLite"
BuildableName = "CSQLite"
BlueprintName = "CSQLite"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GRDBTests"
BuildableName = "GRDBTests"
BlueprintName = "GRDBTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GRDB_GRDBTests"
BuildableName = "GRDB_GRDBTests"
BlueprintName = "GRDB_GRDBTests"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER)
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if !os(Linux)
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER)
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_FTS5
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_FTS5
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_FTS5
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_FTS5
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+3 -3
View File
@@ -40,18 +40,18 @@ let package = Package(
.watchOS(.v7),
],
products: [
.library(name: "CSQLite", targets: ["CSQLite"]),
.library(name: "GRDBSQLite", targets: ["GRDBSQLite"]),
.library(name: "GRDB", targets: ["GRDB"]),
.library(name: "GRDB-dynamic", type: .dynamic, targets: ["GRDB"]),
],
dependencies: dependencies,
targets: [
.systemLibrary(
name: "CSQLite",
name: "GRDBSQLite",
providers: [.apt(["libsqlite3-dev"])]),
.target(
name: "GRDB",
dependencies: ["CSQLite"],
dependencies: ["GRDBSQLite"],
path: "GRDB",
resources: [.copy("PrivacyInfo.xcprivacy")],
cSettings: cSettings,
+1 -1
View File
@@ -348,7 +348,7 @@ GRDB offers two libraries, `GRDB` and `GRDB-dynamic`. Pick only one. When in dou
> **Note**: Linux is not currently supported.
>
> **Warning**: Due to an Xcode bug, you will get "No such module 'CSQLite'" errors when you want to embed the GRDB package in other targets than the main application (watch extensions, for example). UI and Unit testing targets are OK, though. See [#642](https://github.com/groue/GRDB.swift/issues/642#issuecomment-575994093) for more information.
> **Warning**: Due to an Xcode bug, you will get "No such module 'GRDBSQLite'" errors when you want to embed the GRDB package in other targets than the main application (watch extensions, for example). UI and Unit testing targets are OK, though. See [#642](https://github.com/groue/GRDB.swift/issues/642#issuecomment-575994093) and [#1424](https://github.com/groue/GRDB.swift/issues/1424#issuecomment-1774088155) for more information.
## CocoaPods
@@ -1,4 +1,4 @@
module CSQLite [system] {
module GRDBSQLite [system] {
header "shim.h"
link "sqlite3"
export *
File renamed without changes.
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,7 +1,7 @@
#if SQLITE_ENABLE_FTS5
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+1 -1
View File
@@ -1,6 +1,6 @@
// Import C SQLite functions
#if SWIFT_PACKAGE
import CSQLite
import GRDBSQLite
#elseif GRDBCIPHER
import SQLCipher
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER