Skip to content

Commit b26c42c

Browse files
marcpruxmarcprux
committed
Rework import order for SQLCipher; add test conditionals for Android
1 parent 5a3db29 commit b26c42c

File tree

73 files changed

+224
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+224
-143
lines changed

‎GRDB/Core/Configuration.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/Database+Schema.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/Database+Statements.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/Database.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/DatabaseCollation.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/DatabaseError.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/DatabaseFunction.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/DatabaseSnapshotPool.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#if SQLITE_ENABLE_SNAPSHOT || (!GRDBCUSTOMSQLITE && !GRDBCIPHER)
22
// Import C SQLite functions
3-
#if SWIFT_PACKAGE
4-
import GRDBSQLite
5-
#elseif GRDBCIPHER
3+
#if GRDBCIPHER
64
import SQLCipher
5+
#elseif SWIFT_PACKAGE
6+
import GRDBSQLite
77
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
88
import SQLite3
99
#endif

‎GRDB/Core/DatabaseValue.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

‎GRDB/Core/Row.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Import C SQLite functions
2-
#if SWIFT_PACKAGE
3-
import GRDBSQLite
4-
#elseif GRDBCIPHER
2+
#if GRDBCIPHER
53
import SQLCipher
4+
#elseif SWIFT_PACKAGE
5+
import GRDBSQLite
66
#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
77
import SQLite3
88
#endif

0 commit comments

Comments
 (0)