Skip to content

Commit 659d0cd

Browse files
committed
WIP: Carthage Support
This: - Renames the SQLCipher module to SQLiteCipher. - Adds separate iOS/Mac targets. I'm not sure this is the right call yet. It makes testing clumsy and documentation confusing. WIP because: - Documentation hasn't been updated. - CocoaPods support hasn't been retested. Signed-off-by: Stephen Celis <[email protected]>
1 parent 743530d commit 659d0cd

30 files changed

+1400
-340
lines changed

Configuration/Base Mac.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "Base.xcconfig"

Configuration/Base iOS.xcconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "Base.xcconfig"
2+
3+
IPHONEOS_DEPLOYMENT_TARGET = 8.0

Configuration/Base.xcconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Safe for extensions
2+
APPLICATION_EXTENSION_API_ONLY = YES
3+
4+
// Optimize
5+
SWIFT_WHOLE_MODULE_OPTIMIZATION = YES

Configuration/SQLite Base.xcconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// `import SQLite`
2+
PRODUCT_NAME = SQLite
3+
4+
// Load `<sqlite3.h>` into Swift
5+
MODULEMAP_FILE = $(TARGET_NAME)/module.modulemap

Configuration/SQLite Mac.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "Base Mac.xcconfig"
2+
#include "SQLite Base.xcconfig"

Configuration/SQLite iOS.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "Base iOS.xcconfig"
2+
#include "SQLite Base.xcconfig"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// `import SQLiteCipher`
2+
PRODUCT_NAME = SQLiteCipher
3+
4+
// Load `<sqlite3.h>` into Swift
5+
MODULEMAP_FILE = $(TARGET_NAME)/module.modulemap
6+
7+
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) SQLITE_HAS_CODEC
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "Base Mac.xcconfig"
2+
#include "SQLiteCipher Base.xcconfig"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "Base iOS.xcconfig"
2+
#include "SQLiteCipher Base.xcconfig"

SQLite/Info.plist renamed to SQLite Mac/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.1</string>
18+
<string>1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)