Skip to content

[CocoaPods] Add SQLite module map for each architecture #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2016
Merged

[CocoaPods] Add SQLite module map for each architecture #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CocoaPods/appletvos/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/include/sqlite3.h"
export *
}
4 changes: 4 additions & 0 deletions CocoaPods/appletvsimulator/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk/usr/include/sqlite3.h"
export *
}
23 changes: 0 additions & 23 deletions CocoaPods/ios.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions CocoaPods/iphoneos/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
export *
}
4 changes: 4 additions & 0 deletions CocoaPods/iphonesimulator/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"
export *
}
8 changes: 1 addition & 7 deletions CocoaPods/osx.modulemap → CocoaPods/macosx/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
framework module SQLite {
umbrella header "SQLite.h"

module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"

link "sqlite3"

export *
module * { export * }
}
18 changes: 0 additions & 18 deletions CocoaPods/tvos.modulemap
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions CocoaPods/watchos.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions CocoaPods/watchos/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/usr/include/sqlite3.h"
export *
}
4 changes: 4 additions & 0 deletions CocoaPods/watchsimulator/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module CSQLite [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator.sdk/usr/include/sqlite3.h"
export *
}
14 changes: 10 additions & 4 deletions SQLite.swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,16 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.9"
s.watchos.deployment_target = "2.0"

s.ios.module_map = "CocoaPods/ios.modulemap"
s.tvos.module_map = "CocoaPods/tvos.modulemap"
s.osx.module_map = "CocoaPods/osx.modulemap"
s.watchos.module_map = "CocoaPods/watchos.modulemap"
s.preserve_paths = 'CocoaPods/**/*'
s.pod_target_xcconfig = {
'SWIFT_INCLUDE_PATHS[sdk=macosx*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx',
'SWIFT_INCLUDE_PATHS[sdk=iphoneos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphoneos',
'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphonesimulator',
'SWIFT_INCLUDE_PATHS[sdk=appletvos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvos',
'SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvsimulator',
'SWIFT_INCLUDE_PATHS[sdk=watchos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/watchos',
'SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/watchsimulator'
}

s.libraries = 'sqlite3'
s.source_files = 'SQLite/**/*.{c,h,m,swift}'
Expand Down
92 changes: 89 additions & 3 deletions SQLite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,13 @@
03A65E5A1C6BB0F50062603F /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
03A65E631C6BB0F60062603F /* SQLiteTests tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SQLiteTests tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
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; };
39548A631CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
39548A651CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
39548A671CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
39548A691CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
39548A6B1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
39548A6D1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
39548A6F1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
EE247AD31C3F04ED00AE3E12 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
EE247AD61C3F04ED00AE3E12 /* SQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -203,7 +210,7 @@
EE247B8F1C3F822500AE3E12 /* Index.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Index.md; sourceTree = "<group>"; };
EE247B911C3F822500AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
EE247B921C3F822600AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = SQLite.swift.podspec; sourceTree = "<group>"; };
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = SQLite.swift.podspec; sourceTree = "<group>"; };
EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usr/include/sqlite3.h; sourceTree = SDKROOT; };
EE91808D1C46E5230038162A /* SQLite-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SQLite-Bridging.h"; sourceTree = "<group>"; };
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; };
Expand Down Expand Up @@ -269,6 +276,76 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
39548A611CA63C740003E3B5 /* CocoaPods */ = {
isa = PBXGroup;
children = (
39548A621CA63C740003E3B5 /* appletvos */,
39548A641CA63C740003E3B5 /* appletvsimulator */,
39548A661CA63C740003E3B5 /* iphoneos */,
39548A681CA63C740003E3B5 /* iphonesimulator */,
39548A6A1CA63C740003E3B5 /* macosx */,
39548A6C1CA63C740003E3B5 /* watchos */,
39548A6E1CA63C740003E3B5 /* watchsimulator */,
);
path = CocoaPods;
sourceTree = "<group>";
};
39548A621CA63C740003E3B5 /* appletvos */ = {
isa = PBXGroup;
children = (
39548A631CA63C740003E3B5 /* module.modulemap */,
);
path = appletvos;
sourceTree = "<group>";
};
39548A641CA63C740003E3B5 /* appletvsimulator */ = {
isa = PBXGroup;
children = (
39548A651CA63C740003E3B5 /* module.modulemap */,
);
path = appletvsimulator;
sourceTree = "<group>";
};
39548A661CA63C740003E3B5 /* iphoneos */ = {
isa = PBXGroup;
children = (
39548A671CA63C740003E3B5 /* module.modulemap */,
);
path = iphoneos;
sourceTree = "<group>";
};
39548A681CA63C740003E3B5 /* iphonesimulator */ = {
isa = PBXGroup;
children = (
39548A691CA63C740003E3B5 /* module.modulemap */,
);
path = iphonesimulator;
sourceTree = "<group>";
};
39548A6A1CA63C740003E3B5 /* macosx */ = {
isa = PBXGroup;
children = (
39548A6B1CA63C740003E3B5 /* module.modulemap */,
);
path = macosx;
sourceTree = "<group>";
};
39548A6C1CA63C740003E3B5 /* watchos */ = {
isa = PBXGroup;
children = (
39548A6D1CA63C740003E3B5 /* module.modulemap */,
);
path = watchos;
sourceTree = "<group>";
};
39548A6E1CA63C740003E3B5 /* watchsimulator */ = {
isa = PBXGroup;
children = (
39548A6F1CA63C740003E3B5 /* module.modulemap */,
);
path = watchsimulator;
sourceTree = "<group>";
};
EE247AC91C3F04ED00AE3E12 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -373,6 +450,7 @@
EE247B8A1C3F81D000AE3E12 /* Metadata */ = {
isa = PBXGroup;
children = (
39548A611CA63C740003E3B5 /* CocoaPods */,
EE247B771C3F40D700AE3E12 /* README.md */,
EE247B8B1C3F820300AE3E12 /* CONTRIBUTING.md */,
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */,
Expand Down Expand Up @@ -867,6 +945,8 @@
PRODUCT_NAME = SQLite;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
TVOS_DEPLOYMENT_TARGET = 9.1;
};
name = Debug;
Expand All @@ -885,6 +965,8 @@
PRODUCT_NAME = SQLite;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
TVOS_DEPLOYMENT_TARGET = 9.1;
};
name = Release;
Expand Down Expand Up @@ -1064,7 +1146,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
PRODUCT_NAME = SQLite;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = "";
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
Expand All @@ -1085,7 +1168,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
PRODUCT_NAME = SQLite;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = "";
"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = "$(SRCROOT)/CocoaPods/iphoneos";
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
};
name = Release;
};
Expand Down Expand Up @@ -1129,6 +1213,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = "";
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
};
name = Debug;
};
Expand All @@ -1152,6 +1237,7 @@
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_INCLUDE_PATHS = "";
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
};
name = Release;
};
Expand Down
1 change: 1 addition & 0 deletions SQLite/Core/Connection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
//

import Dispatch
import CSQLite

/// A connection to SQLite.
public final class Connection {
Expand Down
2 changes: 2 additions & 0 deletions SQLite/Core/Statement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
// THE SOFTWARE.
//

import CSQLite

/// A single SQL statement.
public final class Statement {

Expand Down
2 changes: 2 additions & 0 deletions SQLite/Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
// THE SOFTWARE.
//

import CSQLite

public typealias Star = (Expression<Binding>?, Expression<Binding>?) -> Expression<Void>

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