Skip to content

Commit ca0043f

Browse files
stephencelisstephencelis
committed
Merge pull request stephencelis#386 from cjwirth/cocoapods-xcode-7-3
[CocoaPods] Add SQLite module map for each architecture
2 parents 29c2faf + 5652283 commit ca0043f

File tree

15 files changed

+129
-73
lines changed

15 files changed

+129
-73
lines changed

‎CocoaPods/appletvos/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/appletvsimulator/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/ios.modulemap

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎CocoaPods/iphoneos/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/iphonesimulator/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/osx.modulemap renamed to ‎CocoaPods/macosx/module.modulemap

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
framework module SQLite {
2-
umbrella header "SQLite.h"
3-
1+
module CSQLite [system] {
42
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"
5-
6-
link "sqlite3"
7-
83
export *
9-
module * { export * }
104
}

‎CocoaPods/tvos.modulemap

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎CocoaPods/watchos.modulemap

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎CocoaPods/watchos/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/watchsimulator/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎SQLite.swift.podspec

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@ Pod::Spec.new do |s|
2525
s.osx.deployment_target = "10.9"
2626
s.watchos.deployment_target = "2.0"
2727

28-
s.ios.module_map = "CocoaPods/ios.modulemap"
29-
s.tvos.module_map = "CocoaPods/tvos.modulemap"
30-
s.osx.module_map = "CocoaPods/osx.modulemap"
31-
s.watchos.module_map = "CocoaPods/watchos.modulemap"
28+
s.preserve_paths = 'CocoaPods/**/*'
29+
s.pod_target_xcconfig = {
30+
'SWIFT_INCLUDE_PATHS[sdk=macosx*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx',
31+
'SWIFT_INCLUDE_PATHS[sdk=iphoneos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphoneos',
32+
'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphonesimulator',
33+
'SWIFT_INCLUDE_PATHS[sdk=appletvos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvos',
34+
'SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvsimulator',
35+
'SWIFT_INCLUDE_PATHS[sdk=watchos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/watchos',
36+
'SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/watchsimulator'
37+
}
3238

3339
s.libraries = 'sqlite3'
3440
s.source_files = 'SQLite/**/*.{c,h,m,swift}'

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 89 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@
154154
03A65E5A1C6BB0F50062603F /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
155155
03A65E631C6BB0F60062603F /* SQLiteTests tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SQLiteTests tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
156156
03A65E961C6BB3210062603F /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
157+
39548A631CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
158+
39548A651CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
159+
39548A671CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
160+
39548A691CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
161+
39548A6B1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
162+
39548A6D1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
163+
39548A6F1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
157164
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
158165
EE247AD31C3F04ED00AE3E12 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
159166
EE247AD61C3F04ED00AE3E12 /* SQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = "<group>"; };
@@ -203,7 +210,7 @@
203210
EE247B8F1C3F822500AE3E12 /* Index.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Index.md; sourceTree = "<group>"; };
204211
EE247B911C3F822500AE3E12 /* installation@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "installation@2x.png"; sourceTree = "<group>"; };
205212
EE247B921C3F822600AE3E12 /* playground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "playground@2x.png"; sourceTree = "<group>"; };
206-
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = SQLite.swift.podspec; sourceTree = "<group>"; };
213+
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = SQLite.swift.podspec; sourceTree = "<group>"; };
207214
EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usr/include/sqlite3.h; sourceTree = SDKROOT; };
208215
EE91808D1C46E5230038162A /* SQLite-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SQLite-Bridging.h"; sourceTree = "<group>"; };
209216
EE9180911C46E9D30038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
@@ -269,6 +276,76 @@
269276
/* End PBXFrameworksBuildPhase section */
270277

271278
/* Begin PBXGroup section */
279+
39548A611CA63C740003E3B5 /* CocoaPods */ = {
280+
isa = PBXGroup;
281+
children = (
282+
39548A621CA63C740003E3B5 /* appletvos */,
283+
39548A641CA63C740003E3B5 /* appletvsimulator */,
284+
39548A661CA63C740003E3B5 /* iphoneos */,
285+
39548A681CA63C740003E3B5 /* iphonesimulator */,
286+
39548A6A1CA63C740003E3B5 /* macosx */,
287+
39548A6C1CA63C740003E3B5 /* watchos */,
288+
39548A6E1CA63C740003E3B5 /* watchsimulator */,
289+
);
290+
path = CocoaPods;
291+
sourceTree = "<group>";
292+
};
293+
39548A621CA63C740003E3B5 /* appletvos */ = {
294+
isa = PBXGroup;
295+
children = (
296+
39548A631CA63C740003E3B5 /* module.modulemap */,
297+
);
298+
path = appletvos;
299+
sourceTree = "<group>";
300+
};
301+
39548A641CA63C740003E3B5 /* appletvsimulator */ = {
302+
isa = PBXGroup;
303+
children = (
304+
39548A651CA63C740003E3B5 /* module.modulemap */,
305+
);
306+
path = appletvsimulator;
307+
sourceTree = "<group>";
308+
};
309+
39548A661CA63C740003E3B5 /* iphoneos */ = {
310+
isa = PBXGroup;
311+
children = (
312+
39548A671CA63C740003E3B5 /* module.modulemap */,
313+
);
314+
path = iphoneos;
315+
sourceTree = "<group>";
316+
};
317+
39548A681CA63C740003E3B5 /* iphonesimulator */ = {
318+
isa = PBXGroup;
319+
children = (
320+
39548A691CA63C740003E3B5 /* module.modulemap */,
321+
);
322+
path = iphonesimulator;
323+
sourceTree = "<group>";
324+
};
325+
39548A6A1CA63C740003E3B5 /* macosx */ = {
326+
isa = PBXGroup;
327+
children = (
328+
39548A6B1CA63C740003E3B5 /* module.modulemap */,
329+
);
330+
path = macosx;
331+
sourceTree = "<group>";
332+
};
333+
39548A6C1CA63C740003E3B5 /* watchos */ = {
334+
isa = PBXGroup;
335+
children = (
336+
39548A6D1CA63C740003E3B5 /* module.modulemap */,
337+
);
338+
path = watchos;
339+
sourceTree = "<group>";
340+
};
341+
39548A6E1CA63C740003E3B5 /* watchsimulator */ = {
342+
isa = PBXGroup;
343+
children = (
344+
39548A6F1CA63C740003E3B5 /* module.modulemap */,
345+
);
346+
path = watchsimulator;
347+
sourceTree = "<group>";
348+
};
272349
EE247AC91C3F04ED00AE3E12 = {
273350
isa = PBXGroup;
274351
children = (
@@ -373,6 +450,7 @@
373450
EE247B8A1C3F81D000AE3E12 /* Metadata */ = {
374451
isa = PBXGroup;
375452
children = (
453+
39548A611CA63C740003E3B5 /* CocoaPods */,
376454
EE247B771C3F40D700AE3E12 /* README.md */,
377455
EE247B8B1C3F820300AE3E12 /* CONTRIBUTING.md */,
378456
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */,
@@ -867,6 +945,8 @@
867945
PRODUCT_NAME = SQLite;
868946
SDKROOT = appletvos;
869947
SKIP_INSTALL = YES;
948+
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
949+
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
870950
TVOS_DEPLOYMENT_TARGET = 9.1;
871951
};
872952
name = Debug;
@@ -885,6 +965,8 @@
885965
PRODUCT_NAME = SQLite;
886966
SDKROOT = appletvos;
887967
SKIP_INSTALL = YES;
968+
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
969+
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
888970
TVOS_DEPLOYMENT_TARGET = 9.1;
889971
};
890972
name = Release;
@@ -1064,7 +1146,8 @@
10641146
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
10651147
PRODUCT_NAME = SQLite;
10661148
SKIP_INSTALL = YES;
1067-
SWIFT_INCLUDE_PATHS = "";
1149+
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
1150+
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
10681151
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10691152
};
10701153
name = Debug;
@@ -1085,7 +1168,8 @@
10851168
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
10861169
PRODUCT_NAME = SQLite;
10871170
SKIP_INSTALL = YES;
1088-
SWIFT_INCLUDE_PATHS = "";
1171+
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
1172+
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
10891173
};
10901174
name = Release;
10911175
};
@@ -1129,6 +1213,7 @@
11291213
SDKROOT = macosx;
11301214
SKIP_INSTALL = YES;
11311215
SWIFT_INCLUDE_PATHS = "";
1216+
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
11321217
};
11331218
name = Debug;
11341219
};
@@ -1152,6 +1237,7 @@
11521237
SDKROOT = macosx;
11531238
SKIP_INSTALL = YES;
11541239
SWIFT_INCLUDE_PATHS = "";
1240+
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
11551241
};
11561242
name = Release;
11571243
};

‎SQLite/Core/Connection.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
//
2424

2525
import Dispatch
26+
import CSQLite
2627

2728
/// A connection to SQLite.
2829
public final class Connection {

‎SQLite/Core/Statement.swift

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

25+
import CSQLite
26+
2527
/// A single SQL statement.
2628
public final class Statement {
2729

‎SQLite/Helpers.swift

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

25+
import CSQLite
26+
2527
public typealias Star = (Expression<Binding>?, Expression<Binding>?) -> Expression<Void>
2628

2729
public func *(_: Expression<Binding>?, _: Expression<Binding>?) -> Expression<Void> {

0 commit comments

Comments
 (0)