Skip to content

Commit 8f64e35

Browse files
stephencelisstephencelis
committed
Remove dummy framework
We can load the SDK header from our custom module map, instead. Let's also link to the iphoneos SDK header, since it shouldn't matter: it's always identical to the iphonesimulator header, and at worst a version behind the macosx header. Signed-off-by: Stephen Celis <stephen@stephencelis.com>
1 parent 1721297 commit 8f64e35

File tree

13 files changed

+20
-213
lines changed

13 files changed

+20
-213
lines changed

‎Documentation/Index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ It’s possible to use SQLite.swift in a target that doesn’t support framework
102102

103103
2. Copy the SQLite.swift source files (from its **SQLite** directory) into your Xcode project.
104104

105-
3. Remove `import sqlite3` (and `@import sqlite3;`) from the SQLite.swift source files that call it.
106-
107-
4. Add the following lines to your project’s [bridging header](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/MixandMatch.html#//apple_ref/doc/uid/TP40014216-CH10-XID_79) (a file usually in the form of `$(TARGET_NAME)-Bridging-Header.h`).
105+
3. Add the following lines to your project’s [bridging header](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/MixandMatch.html#//apple_ref/doc/uid/TP40014216-CH10-XID_79) (a file usually in the form of `$(TARGET_NAME)-Bridging-Header.h`).
108106

109107
``` swift
110108
#import <sqlite3.h>

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 6 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
DC37743819C8D693004FCF85 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743719C8D693004FCF85 /* Value.swift */; };
2424
DC37743B19C8D6C0004FCF85 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743A19C8D6C0004FCF85 /* Statement.swift */; };
2525
DC475EA219F219AF00788FBD /* ExpressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC475E9E19F2199900788FBD /* ExpressionTests.swift */; };
26-
DC5B12131ABE3298000DA146 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5B12121ABE3298000DA146 /* libsqlite3.dylib */; };
2726
DC650B9619F0CDC3002FBE91 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC650B9519F0CDC3002FBE91 /* Expression.swift */; };
2827
DC70AC991AC2331000371524 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC37744219C8DC91004FCF85 /* libsqlite3.dylib */; };
2928
DC70AC9A1AC2331100371524 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC37744219C8DC91004FCF85 /* libsqlite3.dylib */; };
@@ -55,13 +54,6 @@
5554
/* End PBXBuildFile section */
5655

5756
/* Begin PBXContainerItemProxy section */
58-
DC2393CF1ABE37A5003FF113 /* PBXContainerItemProxy */ = {
59-
isa = PBXContainerItemProxy;
60-
containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */;
61-
proxyType = 1;
62-
remoteGlobalIDString = DCAE4D141ABE0B3300EFCE7A;
63-
remoteInfo = sqlite3;
64-
};
6557
DC2DD6AB1ABE428E00C2C71A /* PBXContainerItemProxy */ = {
6658
isa = PBXContainerItemProxy;
6759
containerPortal = DCC6B3961A91938F00734B78 /* sqlcipher.xcodeproj */;
@@ -83,13 +75,6 @@
8375
remoteGlobalIDString = DC3773F219C8CBB3004FCF85;
8476
remoteInfo = SQLite;
8577
};
86-
DCAE4D341ABE0C2800EFCE7A /* PBXContainerItemProxy */ = {
87-
isa = PBXContainerItemProxy;
88-
containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */;
89-
proxyType = 1;
90-
remoteGlobalIDString = DCAE4D141ABE0B3300EFCE7A;
91-
remoteInfo = sqlite3;
92-
};
9378
DCC6B3AA1A91979100734B78 /* PBXContainerItemProxy */ = {
9479
isa = PBXContainerItemProxy;
9580
containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */;
@@ -133,17 +118,11 @@
133118
DC3F170F1A8127A300C83A2F /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
134119
DC3F17121A814F7000C83A2F /* FunctionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FunctionsTests.swift; sourceTree = "<group>"; };
135120
DC475E9E19F2199900788FBD /* ExpressionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExpressionTests.swift; sourceTree = "<group>"; };
136-
DC5B12121ABE3298000DA146 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/usr/lib/libsqlite3.dylib; sourceTree = DEVELOPER_DIR; };
137121
DC650B9519F0CDC3002FBE91 /* Expression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Expression.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
122+
DC74B0421B095575007E1138 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
138123
DC97EC9F1ADE955E00F550A6 /* SQLite.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = SQLite.playground; sourceTree = "<group>"; };
139124
DCAD429619E2E0F1004A51DF /* Query.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Query.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
140125
DCAD429919E2EE50004A51DF /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
141-
DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sqlite3.framework; sourceTree = BUILT_PRODUCTS_DIR; };
142-
DCAE4D181ABE0B3300EFCE7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
143-
DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlite3.xcconfig; sourceTree = "<group>"; };
144-
DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphoneos.modulemap; sourceTree = "<group>"; };
145-
DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphonesimulator.modulemap; sourceTree = "<group>"; };
146-
DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = macosx.modulemap; sourceTree = "<group>"; };
147126
DCAFEAD21AABC818000C21A1 /* FTS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS.swift; sourceTree = "<group>"; };
148127
DCAFEAD61AABEFA7000C21A1 /* FTSTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTSTests.swift; sourceTree = "<group>"; };
149128
DCBE28401ABDF18F0042A3FC /* RTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTree.swift; sourceTree = "<group>"; };
@@ -175,14 +154,6 @@
175154
);
176155
runOnlyForDeploymentPostprocessing = 0;
177156
};
178-
DCAE4D111ABE0B3300EFCE7A /* Frameworks */ = {
179-
isa = PBXFrameworksBuildPhase;
180-
buildActionMask = 2147483647;
181-
files = (
182-
DC5B12131ABE3298000DA146 /* libsqlite3.dylib in Frameworks */,
183-
);
184-
runOnlyForDeploymentPostprocessing = 0;
185-
};
186157
DCC6B3761A9191C300734B78 /* Frameworks */ = {
187158
isa = PBXFrameworksBuildPhase;
188159
buildActionMask = 2147483647;
@@ -250,7 +221,6 @@
250221
DC10500F19C904DD00D8CA30 /* SQLite Tests */,
251222
DCC6B3A11A91949C00734B78 /* SQLiteCipher */,
252223
DCC6B3A21A91949C00734B78 /* SQLiteCipher Tests */,
253-
DCAE4D161ABE0B3300EFCE7A /* sqlite3 */,
254224
DCC6B3961A91938F00734B78 /* sqlcipher.xcodeproj */,
255225
DC3773F419C8CBB3004FCF85 /* Products */,
256226
);
@@ -266,7 +236,6 @@
266236
DC3773FE19C8CBB3004FCF85 /* SQLite Tests.xctest */,
267237
DCC6B3801A9191C300734B78 /* SQLite.framework */,
268238
DCC6B3921A9191D100734B78 /* SQLiteCipher Tests.xctest */,
269-
DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */,
270239
);
271240
name = Products;
272241
sourceTree = "<group>";
@@ -302,27 +271,7 @@
302271
DC3773F719C8CBB3004FCF85 /* Info.plist */,
303272
DC37744219C8DC91004FCF85 /* libsqlite3.dylib */,
304273
DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */,
305-
);
306-
name = "Supporting Files";
307-
sourceTree = "<group>";
308-
};
309-
DCAE4D161ABE0B3300EFCE7A /* sqlite3 */ = {
310-
isa = PBXGroup;
311-
children = (
312-
DCAE4D171ABE0B3300EFCE7A /* Supporting Files */,
313-
);
314-
path = sqlite3;
315-
sourceTree = "<group>";
316-
};
317-
DCAE4D171ABE0B3300EFCE7A /* Supporting Files */ = {
318-
isa = PBXGroup;
319-
children = (
320-
DCAE4D181ABE0B3300EFCE7A /* Info.plist */,
321-
DC5B12121ABE3298000DA146 /* libsqlite3.dylib */,
322-
DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */,
323-
DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */,
324-
DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */,
325-
DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */,
274+
DC74B0421B095575007E1138 /* module.modulemap */,
326275
);
327276
name = "Supporting Files";
328277
sourceTree = "<group>";
@@ -356,13 +305,6 @@
356305
);
357306
runOnlyForDeploymentPostprocessing = 0;
358307
};
359-
DCAE4D121ABE0B3300EFCE7A /* Headers */ = {
360-
isa = PBXHeadersBuildPhase;
361-
buildActionMask = 2147483647;
362-
files = (
363-
);
364-
runOnlyForDeploymentPostprocessing = 0;
365-
};
366308
DCC6B3781A9191C300734B78 /* Headers */ = {
367309
isa = PBXHeadersBuildPhase;
368310
buildActionMask = 2147483647;
@@ -388,7 +330,6 @@
388330
buildRules = (
389331
);
390332
dependencies = (
391-
DCAE4D351ABE0C2800EFCE7A /* PBXTargetDependency */,
392333
);
393334
name = SQLite;
394335
productName = SQLite;
@@ -413,24 +354,6 @@
413354
productReference = DC3773FE19C8CBB3004FCF85 /* SQLite Tests.xctest */;
414355
productType = "com.apple.product-type.bundle.unit-test";
415356
};
416-
DCAE4D141ABE0B3300EFCE7A /* sqlite3 */ = {
417-
isa = PBXNativeTarget;
418-
buildConfigurationList = DCAE4D281ABE0B3400EFCE7A /* Build configuration list for PBXNativeTarget "sqlite3" */;
419-
buildPhases = (
420-
DCAE4D101ABE0B3300EFCE7A /* Sources */,
421-
DCAE4D111ABE0B3300EFCE7A /* Frameworks */,
422-
DCAE4D121ABE0B3300EFCE7A /* Headers */,
423-
DCAE4D131ABE0B3300EFCE7A /* Resources */,
424-
);
425-
buildRules = (
426-
);
427-
dependencies = (
428-
);
429-
name = sqlite3;
430-
productName = sqlite3;
431-
productReference = DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */;
432-
productType = "com.apple.product-type.framework";
433-
};
434357
DCC6B36D1A9191C300734B78 /* SQLiteCipher */ = {
435358
isa = PBXNativeTarget;
436359
buildConfigurationList = DCC6B37D1A9191C300734B78 /* Build configuration list for PBXNativeTarget "SQLiteCipher" */;
@@ -445,7 +368,6 @@
445368
);
446369
dependencies = (
447370
DC2DD6B21ABE438900C2C71A /* PBXTargetDependency */,
448-
DC2393D01ABE37A5003FF113 /* PBXTargetDependency */,
449371
);
450372
name = SQLiteCipher;
451373
productName = SQLite;
@@ -485,9 +407,6 @@
485407
DC3773FD19C8CBB3004FCF85 = {
486408
CreatedOnToolsVersion = 6.1;
487409
};
488-
DCAE4D141ABE0B3300EFCE7A = {
489-
CreatedOnToolsVersion = 6.3;
490-
};
491410
};
492411
};
493412
buildConfigurationList = DC3773ED19C8CBB3004FCF85 /* Build configuration list for PBXProject "SQLite" */;
@@ -512,7 +431,6 @@
512431
DC3773FD19C8CBB3004FCF85 /* SQLite Tests */,
513432
DCC6B36D1A9191C300734B78 /* SQLiteCipher */,
514433
DCC6B3821A9191D100734B78 /* SQLiteCipher Tests */,
515-
DCAE4D141ABE0B3300EFCE7A /* sqlite3 */,
516434
);
517435
};
518436
/* End PBXProject section */
@@ -542,13 +460,6 @@
542460
);
543461
runOnlyForDeploymentPostprocessing = 0;
544462
};
545-
DCAE4D131ABE0B3300EFCE7A /* Resources */ = {
546-
isa = PBXResourcesBuildPhase;
547-
buildActionMask = 2147483647;
548-
files = (
549-
);
550-
runOnlyForDeploymentPostprocessing = 0;
551-
};
552463
DCC6B37C1A9191C300734B78 /* Resources */ = {
553464
isa = PBXResourcesBuildPhase;
554465
buildActionMask = 2147483647;
@@ -571,15 +482,15 @@
571482
buildActionMask = 2147483647;
572483
files = (
573484
DC37743519C8D626004FCF85 /* Database.swift in Sources */,
574-
DC2393CA1ABE35F8003FF113 /* SQLite-Bridging.m in Sources */,
575-
DCAFEAD31AABC818000C21A1 /* FTS.swift in Sources */,
576485
DC37743B19C8D6C0004FCF85 /* Statement.swift in Sources */,
577486
DC37743819C8D693004FCF85 /* Value.swift in Sources */,
578487
DC650B9619F0CDC3002FBE91 /* Expression.swift in Sources */,
579-
DCBE28411ABDF18F0042A3FC /* RTree.swift in Sources */,
488+
DCC6B3A81A91975700734B78 /* Functions.swift in Sources */,
580489
DCAD429719E2E0F1004A51DF /* Query.swift in Sources */,
490+
DCAFEAD31AABC818000C21A1 /* FTS.swift in Sources */,
491+
DCBE28411ABDF18F0042A3FC /* RTree.swift in Sources */,
581492
DC109CE11A0C4D970070988E /* Schema.swift in Sources */,
582-
DCC6B3A81A91975700734B78 /* Functions.swift in Sources */,
493+
DC2393CA1ABE35F8003FF113 /* SQLite-Bridging.m in Sources */,
583494
);
584495
runOnlyForDeploymentPostprocessing = 0;
585496
};
@@ -599,13 +510,6 @@
599510
);
600511
runOnlyForDeploymentPostprocessing = 0;
601512
};
602-
DCAE4D101ABE0B3300EFCE7A /* Sources */ = {
603-
isa = PBXSourcesBuildPhase;
604-
buildActionMask = 2147483647;
605-
files = (
606-
);
607-
runOnlyForDeploymentPostprocessing = 0;
608-
};
609513
DCC6B36E1A9191C300734B78 /* Sources */ = {
610514
isa = PBXSourcesBuildPhase;
611515
buildActionMask = 2147483647;
@@ -636,11 +540,6 @@
636540
/* End PBXSourcesBuildPhase section */
637541

638542
/* Begin PBXTargetDependency section */
639-
DC2393D01ABE37A5003FF113 /* PBXTargetDependency */ = {
640-
isa = PBXTargetDependency;
641-
target = DCAE4D141ABE0B3300EFCE7A /* sqlite3 */;
642-
targetProxy = DC2393CF1ABE37A5003FF113 /* PBXContainerItemProxy */;
643-
};
644543
DC2DD6B21ABE438900C2C71A /* PBXTargetDependency */ = {
645544
isa = PBXTargetDependency;
646545
name = sqlcipher;
@@ -651,11 +550,6 @@
651550
target = DC3773F219C8CBB3004FCF85 /* SQLite */;
652551
targetProxy = DC37740019C8CBB3004FCF85 /* PBXContainerItemProxy */;
653552
};
654-
DCAE4D351ABE0C2800EFCE7A /* PBXTargetDependency */ = {
655-
isa = PBXTargetDependency;
656-
target = DCAE4D141ABE0B3300EFCE7A /* sqlite3 */;
657-
targetProxy = DCAE4D341ABE0C2800EFCE7A /* PBXContainerItemProxy */;
658-
};
659553
DCC6B3AB1A91979100734B78 /* PBXTargetDependency */ = {
660554
isa = PBXTargetDependency;
661555
target = DCC6B36D1A9191C300734B78 /* SQLiteCipher */;
@@ -799,44 +693,6 @@
799693
};
800694
name = Release;
801695
};
802-
DCAE4D291ABE0B3400EFCE7A /* Debug */ = {
803-
isa = XCBuildConfiguration;
804-
baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
805-
buildSettings = {
806-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
807-
DEFINES_MODULE = YES;
808-
DYLIB_COMPATIBILITY_VERSION = 1;
809-
DYLIB_CURRENT_VERSION = 1;
810-
DYLIB_INSTALL_NAME_BASE = "@rpath";
811-
GCC_NO_COMMON_BLOCKS = YES;
812-
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
813-
INFOPLIST_FILE = sqlite3/Info.plist;
814-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
815-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
816-
PRODUCT_NAME = "$(TARGET_NAME)";
817-
SKIP_INSTALL = YES;
818-
};
819-
name = Debug;
820-
};
821-
DCAE4D2A1ABE0B3400EFCE7A /* Release */ = {
822-
isa = XCBuildConfiguration;
823-
baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
824-
buildSettings = {
825-
COPY_PHASE_STRIP = NO;
826-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
827-
DEFINES_MODULE = YES;
828-
DYLIB_COMPATIBILITY_VERSION = 1;
829-
DYLIB_CURRENT_VERSION = 1;
830-
DYLIB_INSTALL_NAME_BASE = "@rpath";
831-
GCC_NO_COMMON_BLOCKS = YES;
832-
INFOPLIST_FILE = sqlite3/Info.plist;
833-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
834-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
835-
PRODUCT_NAME = "$(TARGET_NAME)";
836-
SKIP_INSTALL = YES;
837-
};
838-
name = Release;
839-
};
840696
DCC6B37E1A9191C300734B78 /* Debug */ = {
841697
isa = XCBuildConfiguration;
842698
baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
@@ -933,15 +789,6 @@
933789
defaultConfigurationIsVisible = 0;
934790
defaultConfigurationName = Release;
935791
};
936-
DCAE4D281ABE0B3400EFCE7A /* Build configuration list for PBXNativeTarget "sqlite3" */ = {
937-
isa = XCConfigurationList;
938-
buildConfigurations = (
939-
DCAE4D291ABE0B3400EFCE7A /* Debug */,
940-
DCAE4D2A1ABE0B3400EFCE7A /* Release */,
941-
);
942-
defaultConfigurationIsVisible = 0;
943-
defaultConfigurationName = Release;
944-
};
945792
DCC6B37D1A9191C300734B78 /* Build configuration list for PBXNativeTarget "SQLiteCipher" */ = {
946793
isa = XCConfigurationList;
947794
buildConfigurations = (

‎SQLite/Database.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
// THE SOFTWARE.
2323
//
2424

25-
import sqlite3
26-
2725
/// A connection (handle) to SQLite.
2826
public final class Database {
2927

‎SQLite/SQLite-Bridging.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
#import "SQLite-Bridging.h"
2626

27-
@import sqlite3;
28-
2927
#import "fts3_tokenizer.h"
3028

3129
static int __SQLiteBusyHandler(void * context, int tries) {

‎SQLite/SQLite.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
APPLICATION_EXTENSION_API_ONLY = YES
22
SWIFT_WHOLE_MODULE_OPTIMIZATION = YES
33

4+
MODULEMAP_FILE = $(SRCROOT)/SQLite/module.modulemap
5+
46
// Universal Framework
57

68
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx

‎SQLite/Statement.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
// THE SOFTWARE.
2323
//
2424

25-
import sqlite3
26-
2725
internal let SQLITE_STATIC = sqlite3_destructor_type(COpaquePointer(bitPattern: 0))
2826
internal let SQLITE_TRANSIENT = sqlite3_destructor_type(COpaquePointer(bitPattern: -1))
2927

‎SQLite/module.modulemap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
framework module SQLite {
2+
umbrella header "SQLite.h"
3+
4+
// Load the SDK header alongside SQLite.swift. Alternative headers:
5+
// header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"
6+
// header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sqlite3.h"
7+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
8+
9+
export *
10+
module * { export * }
11+
}

‎SQLiteCipher/Cipher.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
// THE SOFTWARE.
2323
//
2424

25-
import sqlite3
26-
2725
extension Database {
2826

2927
public func key(key: String) {

0 commit comments

Comments
 (0)