Skip to content

Commit dc4543f

Browse files
stephencelisstephencelis
committed
Merge pull request stephencelis#327 from stephencelis/podspec2
0.9.2 candidate. Hopefully fixes: stephencelis#324, stephencelis#325, stephencelis#326
2 parents d6c3d18 + fb3afee commit dc4543f

File tree

14 files changed

+89
-41
lines changed

14 files changed

+89
-41
lines changed

‎Documentation/Index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ install SQLite.swift with Carthage:
7878
2. Update your Cartfile to include the following:
7979

8080
```
81-
github "stephencelis/SQLite.swift" ~> 0.9.1
81+
github "stephencelis/SQLite.swift" ~> 0.9.2
8282
```
8383
8484
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -100,7 +100,7 @@ install SQLite.swift with Carthage:
100100
``` ruby
101101
use_frameworks!
102102
103-
pod 'SQLite.swift', '~> 0.9.1'
103+
pod 'SQLite.swift', '~> 0.9.2'
104104
```
105105
106106
3. Run `pod install`.

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# SQLite.swift [![Build Status][Badge]][Travis]
1+
# SQLite.swift
2+
3+
[![Build Status][Badge]][Travis] [![CocoaPods Version](https://cocoapod-badges.herokuapp.com/v/SQLite.swift/badge.png)](http://cocoadocs.org/docsets/SQLite.swift) [![Platform](https://cocoapod-badges.herokuapp.com/p/SQLite.swift/badge.png)](http://cocoadocs.org/docsets/SQLite.swift) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
24

35
A type-safe, [Swift][]-language layer over [SQLite3][].
46

@@ -124,7 +126,7 @@ install SQLite.swift with Carthage:
124126
2. Update your Cartfile to include the following:
125127

126128
```
127-
github "stephencelis/SQLite.swift" ~> 0.9.1
129+
github "stephencelis/SQLite.swift" ~> 0.9.2
128130
```
129131
130132
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -148,7 +150,7 @@ SQLite.swift with CocoaPods:
148150
``` ruby
149151
use_frameworks!
150152
151-
pod 'SQLite.swift', '~> 0.9.1'
153+
pod 'SQLite.swift', '~> 0.9.2'
152154
```
153155
154156
3. Run `pod install`.

‎SQLite.swift.podspec

Lines changed: 5 additions & 6 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.1"
8+
s.version = "0.9.2"
99
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
1010

1111
s.description = <<-DESC
@@ -21,12 +21,11 @@ Pod::Spec.new do |s|
2121

2222
s.module_name = 'SQLite'
2323
s.ios.deployment_target = "8.0"
24+
s.tvos.deployment_target = "9.0"
25+
s.osx.deployment_target = "10.9"
2426

27+
s.module_map = "podstuff/module.modulemap"
28+
s.libraries = 'sqlite3'
2529
s.source_files = 'SQLite/**/*'
2630
s.private_header_files = 'SQLite/Core/fts3_tokenizer.h'
27-
28-
# make the sqlite3 C library behave like a module
29-
s.libraries = 'sqlite3'
30-
s.xcconfig = { 'SWIFT_INCLUDE_PATHS' => '${PODS_ROOT}/SQLite.swift/SQLite3' }
31-
s.preserve_path = 'SQLite3/*'
3231
end

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
EE247B731C3F3FEC00AE3E12 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B001C3F06E900AE3E12 /* Query.swift */; };
8080
EE247B741C3F3FEC00AE3E12 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B011C3F06E900AE3E12 /* Schema.swift */; };
8181
EE247B751C3F3FEC00AE3E12 /* Setter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B021C3F06E900AE3E12 /* Setter.swift */; };
82+
EE91808C1C46E34A0038162A /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
83+
EE91808E1C46E5230038162A /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
84+
EE91808F1C46E76D0038162A /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
85+
EE9180901C46E8980038162A /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
86+
EE9180941C46EA210038162A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9180931C46EA210038162A /* libsqlite3.tbd */; };
87+
EE9180951C46EBCC0038162A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9180911C46E9D30038162A /* libsqlite3.tbd */; };
8288
/* End PBXBuildFile section */
8389

8490
/* Begin PBXContainerItemProxy section */
@@ -148,13 +154,18 @@
148154
EE247B911C3F822500AE3E12 /* installation@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "installation@2x.png"; sourceTree = "<group>"; };
149155
EE247B921C3F822600AE3E12 /* playground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "playground@2x.png"; sourceTree = "<group>"; };
150156
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = SQLite.swift.podspec; sourceTree = "<group>"; };
157+
EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usr/include/sqlite3.h; sourceTree = SDKROOT; };
158+
EE91808D1C46E5230038162A /* SQLite-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SQLite-Bridging.h"; sourceTree = "<group>"; };
159+
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; };
160+
EE9180931C46EA210038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
151161
/* End PBXFileReference section */
152162

153163
/* Begin PBXFrameworksBuildPhase section */
154164
EE247ACF1C3F04ED00AE3E12 /* Frameworks */ = {
155165
isa = PBXFrameworksBuildPhase;
156166
buildActionMask = 2147483647;
157167
files = (
168+
EE9180941C46EA210038162A /* libsqlite3.tbd in Frameworks */,
158169
);
159170
runOnlyForDeploymentPostprocessing = 0;
160171
};
@@ -170,6 +181,7 @@
170181
isa = PBXFrameworksBuildPhase;
171182
buildActionMask = 2147483647;
172183
files = (
184+
EE9180951C46EBCC0038162A /* libsqlite3.tbd in Frameworks */,
173185
);
174186
runOnlyForDeploymentPostprocessing = 0;
175187
};
@@ -208,6 +220,7 @@
208220
EE247AD51C3F04ED00AE3E12 /* SQLite */ = {
209221
isa = PBXGroup;
210222
children = (
223+
EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */,
211224
EE247AD61C3F04ED00AE3E12 /* SQLite.h */,
212225
EE247AF71C3F06E900AE3E12 /* Foundation.swift */,
213226
EE247AF81C3F06E900AE3E12 /* Helpers.swift */,
@@ -245,6 +258,7 @@
245258
EE247AED1C3F06E900AE3E12 /* Core */ = {
246259
isa = PBXGroup;
247260
children = (
261+
EE91808D1C46E5230038162A /* SQLite-Bridging.h */,
248262
EE247AEE1C3F06E900AE3E12 /* Blob.swift */,
249263
EE247AEF1C3F06E900AE3E12 /* Connection.swift */,
250264
EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */,
@@ -288,6 +302,8 @@
288302
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */,
289303
EE247B8C1C3F821200AE3E12 /* .travis.yml */,
290304
EE247B8D1C3F821200AE3E12 /* Makefile */,
305+
EE9180931C46EA210038162A /* libsqlite3.tbd */,
306+
EE9180911C46E9D30038162A /* libsqlite3.tbd */,
291307
EE247B8E1C3F822500AE3E12 /* Documentation */,
292308
);
293309
name = Metadata;
@@ -318,7 +334,9 @@
318334
isa = PBXHeadersBuildPhase;
319335
buildActionMask = 2147483647;
320336
files = (
337+
EE91808E1C46E5230038162A /* SQLite-Bridging.h in Headers */,
321338
EE247B051C3F06E900AE3E12 /* fts3_tokenizer.h in Headers */,
339+
EE91808C1C46E34A0038162A /* usr/include/sqlite3.h in Headers */,
322340
EE247AD71C3F04ED00AE3E12 /* SQLite.h in Headers */,
323341
);
324342
runOnlyForDeploymentPostprocessing = 0;
@@ -327,8 +345,10 @@
327345
isa = PBXHeadersBuildPhase;
328346
buildActionMask = 2147483647;
329347
files = (
348+
EE9180901C46E8980038162A /* usr/include/sqlite3.h in Headers */,
330349
EE247B671C3F3FEC00AE3E12 /* fts3_tokenizer.h in Headers */,
331350
EE247B621C3F3FDB00AE3E12 /* SQLite.h in Headers */,
351+
EE91808F1C46E76D0038162A /* SQLite-Bridging.h in Headers */,
332352
);
333353
runOnlyForDeploymentPostprocessing = 0;
334354
};
@@ -701,7 +721,7 @@
701721
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
702722
PRODUCT_NAME = SQLite;
703723
SKIP_INSTALL = YES;
704-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/SQLite3";
724+
SWIFT_INCLUDE_PATHS = "";
705725
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
706726
};
707727
name = Debug;
@@ -722,7 +742,7 @@
722742
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
723743
PRODUCT_NAME = SQLite;
724744
SKIP_INSTALL = YES;
725-
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/SQLite3";
745+
SWIFT_INCLUDE_PATHS = "";
726746
};
727747
name = Release;
728748
};
@@ -765,7 +785,7 @@
765785
PRODUCT_NAME = SQLite;
766786
SDKROOT = macosx;
767787
SKIP_INSTALL = YES;
768-
SWIFT_INCLUDE_PATHS = "${SRCROOT}/SQLite3";
788+
SWIFT_INCLUDE_PATHS = "";
769789
};
770790
name = Debug;
771791
};
@@ -788,7 +808,7 @@
788808
PRODUCT_NAME = SQLite;
789809
SDKROOT = macosx;
790810
SKIP_INSTALL = YES;
791-
SWIFT_INCLUDE_PATHS = "${SRCROOT}/SQLite3";
811+
SWIFT_INCLUDE_PATHS = "";
792812
};
793813
name = Release;
794814
};

‎SQLite/Core/Blob.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
public struct Blob {
2826

2927
public let bytes: [UInt8]

‎SQLite/Core/Connection.swift

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

2525
import Dispatch
26-
import SQLite3
2726

2827
/// A connection to SQLite.
2928
public final class Connection {

‎SQLite/Core/SQLite-Bridging.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
//
2+
// SQLite.swift
3+
// https://github.com/stephencelis/SQLite.swift
4+
// Copyright © 2014-2015 Stephen Celis.
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in
14+
// all copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
// THE SOFTWARE.
23+
//
24+
25+
@import Foundation;
26+
27+
#ifndef COCOAPODS
28+
#import "sqlite3.h"
29+
#endif
30+
31+
typedef struct SQLiteHandle SQLiteHandle; // CocoaPods workaround
32+
33+
NS_ASSUME_NONNULL_BEGIN
34+
typedef NSString * _Nullable (^_SQLiteTokenizerNextCallback)(const char * input, int * inputOffset, int * inputLength);
35+
int _SQLiteRegisterTokenizer(SQLiteHandle * db, const char * module, const char * tokenizer, _Nullable _SQLiteTokenizerNextCallback callback);
36+
NS_ASSUME_NONNULL_END
37+

‎SQLite/Core/SQLite-Bridging.m

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

25-
#import "fts3_tokenizer.h"
26-
25+
#import "SQLite-Bridging.h"
2726
#import "sqlite3.h"
28-
29-
#import <SQLite.h>
27+
#import "fts3_tokenizer.h"
3028

3129
#pragma mark - FTS
3230

‎SQLite/Core/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
/// A single SQL statement.
2826
public final class Statement {
2927

‎SQLite/Helpers.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
public typealias Star = (Expression<Binding>?, Expression<Binding>?) -> Expression<Void>
2826

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

‎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.1</string>
18+
<string>0.9.2</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎SQLite/SQLite.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@
33
FOUNDATION_EXPORT double SQLiteVersionNumber;
44
FOUNDATION_EXPORT const unsigned char SQLiteVersionString[];
55

6-
typedef struct SQLiteHandle SQLiteHandle; // ??? - CocoaPods workaround
7-
8-
NS_ASSUME_NONNULL_BEGIN
9-
typedef NSString * _Nullable (^_SQLiteTokenizerNextCallback)(const char * input, int * inputOffset, int * inputLength);
10-
int _SQLiteRegisterTokenizer(SQLiteHandle * db, const char * module, const char * tokenizer, _Nullable _SQLiteTokenizerNextCallback callback);
11-
NS_ASSUME_NONNULL_END
6+
#import <SQLite/SQLite-Bridging.h>

‎SQLite3/module.modulemap

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

‎podstuff/module.modulemap

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

0 commit comments

Comments
 (0)