Skip to content

Commit ccc82c0

Browse files
committed
Merge pull request stephencelis#320 from stephencelis/module-map-path
Use hard-coded SDK path for system module map
2 parents 3b22bd0 + ae7b879 commit ccc82c0

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

SQLite.swift.podspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
Pod::Spec.new do |s|
77
s.name = "SQLite.swift"
8-
s.version = "0.9.0"
8+
s.version = "0.9.1"
99
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
1010

1111
s.description = <<-DESC
@@ -20,14 +20,13 @@ Pod::Spec.new do |s|
2020
s.social_media_url = 'https://twitter.com/stephencelis'
2121

2222
s.module_name = 'SQLite'
23-
s.module_map = 'module.modulemap'
2423
s.ios.deployment_target = "8.0"
2524

2625
s.source_files = 'SQLite/**/*'
26+
s.private_header_files = 'SQLite/Core/fts3_tokenizer.h'
2727

2828
# make the sqlite3 C library behave like a module
2929
s.libraries = 'sqlite3'
3030
s.xcconfig = { 'SWIFT_INCLUDE_PATHS' => '${PODS_ROOT}/SQLite.swift/SQLite3' }
3131
s.preserve_path = 'SQLite3/*'
32-
3332
end

SQLite.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@
630630
GCC_WARN_UNUSED_FUNCTION = YES;
631631
GCC_WARN_UNUSED_VARIABLE = YES;
632632
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
633+
MACOSX_DEPLOYMENT_TARGET = 10.9;
633634
MTL_ENABLE_DEBUG_INFO = YES;
634635
ONLY_ACTIVE_ARCH = YES;
635636
PRODUCT_NAME = "";
@@ -673,6 +674,7 @@
673674
GCC_WARN_UNUSED_FUNCTION = YES;
674675
GCC_WARN_UNUSED_VARIABLE = YES;
675676
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
677+
MACOSX_DEPLOYMENT_TARGET = 10.9;
676678
MTL_ENABLE_DEBUG_INFO = NO;
677679
PRODUCT_NAME = "";
678680
SDKROOT = iphoneos;
@@ -686,6 +688,7 @@
686688
EE247AE81C3F04ED00AE3E12 /* Debug */ = {
687689
isa = XCBuildConfiguration;
688690
buildSettings = {
691+
APPLICATION_EXTENSION_API_ONLY = YES;
689692
CLANG_ENABLE_MODULES = YES;
690693
DEFINES_MODULE = YES;
691694
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -706,6 +709,7 @@
706709
EE247AE91C3F04ED00AE3E12 /* Release */ = {
707710
isa = XCBuildConfiguration;
708711
buildSettings = {
712+
APPLICATION_EXTENSION_API_ONLY = YES;
709713
CLANG_ENABLE_MODULES = YES;
710714
DEFINES_MODULE = YES;
711715
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -745,6 +749,7 @@
745749
EE247B4D1C3F3ED000AE3E12 /* Debug */ = {
746750
isa = XCBuildConfiguration;
747751
buildSettings = {
752+
APPLICATION_EXTENSION_API_ONLY = YES;
748753
CODE_SIGN_IDENTITY = "-";
749754
COMBINE_HIDPI_IMAGES = YES;
750755
DEFINES_MODULE = YES;
@@ -767,6 +772,7 @@
767772
EE247B4E1C3F3ED000AE3E12 /* Release */ = {
768773
isa = XCBuildConfiguration;
769774
buildSettings = {
775+
APPLICATION_EXTENSION_API_ONLY = YES;
770776
CODE_SIGN_IDENTITY = "-";
771777
COMBINE_HIDPI_IMAGES = YES;
772778
DEFINES_MODULE = YES;

SQLite/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.9.0</string>
18+
<string>0.9.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

SQLite3/module.modulemap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
module SQLite3 [system] {
2-
header "/usr/include/sqlite3.h"
2+
// Requires latest Xcode installed in standard path.
3+
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"
4+
35
link "sqlite3"
6+
47
export *
58
}

module.modulemap

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

0 commit comments

Comments
 (0)