Skip to content

Commit b0e6d27

Browse files
jberkeljberkel
authored
Merge pull request stephencelis#524 from stephencelis/prepare-0.11.0
Prepare and publish 0.11.0
2 parents dc1b0c4 + 7d63509 commit b0e6d27

File tree

10 files changed

+181
-39
lines changed

10 files changed

+181
-39
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ before_install:
1616
- gem install xcpretty --no-document
1717
script:
1818
- ./run-tests.sh
19-
after_failure:
20-
- find $HOME/Library/Developer/Xcode/DerivedData/ -name '*.log' -print0 | xargs -0 cat
21-
- cat /var/log/system.log

‎CocoaPodsTests/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '~> 1.1.0.rc.2'
3+
gem 'cocoapods', '~> 1.1.0.rc.3'
44
gem 'minitest'

‎CocoaPodsTests/Gemfile.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
claide (1.0.0)
11-
cocoapods (1.1.0.rc.2)
10+
claide (1.0.1)
11+
cocoapods (1.1.0.rc.3)
1212
activesupport (>= 4.0.2, < 5)
13-
claide (>= 1.0.0, < 2.0)
14-
cocoapods-core (= 1.1.0.rc.2)
13+
claide (>= 1.0.1, < 2.0)
14+
cocoapods-core (= 1.1.0.rc.3)
1515
cocoapods-deintegrate (>= 1.0.1, < 2.0)
1616
cocoapods-downloader (>= 1.1.1, < 2.0)
1717
cocoapods-plugins (>= 1.0.0, < 2.0)
1818
cocoapods-search (>= 1.0.0, < 2.0)
1919
cocoapods-stats (>= 1.0.0, < 2.0)
20-
cocoapods-trunk (>= 1.0.0, < 2.0)
20+
cocoapods-trunk (= 1.1.0.beta.1)
2121
cocoapods-try (>= 1.1.0, < 2.0)
2222
colored (~> 1.2)
2323
escape (~> 0.0.4)
24-
fourflusher (~> 1.0.1)
24+
fourflusher (~> 2.0)
2525
gh_inspector (~> 1.0)
2626
molinillo (~> 0.5.1)
2727
nap (~> 1.0)
28-
xcodeproj (>= 1.3.1, < 2.0)
29-
cocoapods-core (1.1.0.rc.2)
28+
xcodeproj (>= 1.3.2, < 2.0)
29+
cocoapods-core (1.1.0.rc.3)
3030
activesupport (>= 4.0.2, < 5)
3131
fuzzy_match (~> 2.0.4)
3232
nap (~> 1.0)
@@ -36,35 +36,35 @@ GEM
3636
nap
3737
cocoapods-search (1.0.0)
3838
cocoapods-stats (1.0.0)
39-
cocoapods-trunk (1.0.0)
39+
cocoapods-trunk (1.1.0.beta.1)
4040
nap (>= 0.8, < 2.0)
4141
netrc (= 0.7.8)
4242
cocoapods-try (1.1.0)
4343
colored (1.2)
4444
escape (0.0.4)
45-
fourflusher (1.0.1)
45+
fourflusher (2.0.0)
4646
fuzzy_match (2.0.4)
4747
gh_inspector (1.0.2)
4848
i18n (0.7.0)
4949
json (1.8.3)
50-
minitest (5.9.0)
50+
minitest (5.9.1)
5151
molinillo (0.5.1)
5252
nap (1.1.0)
5353
netrc (0.7.8)
5454
thread_safe (0.3.5)
5555
tzinfo (1.2.2)
5656
thread_safe (~> 0.1)
57-
xcodeproj (1.3.1)
57+
xcodeproj (1.3.2)
5858
activesupport (>= 3)
59-
claide (>= 1.0.0, < 2.0)
59+
claide (>= 1.0.1, < 2.0)
6060
colored (~> 1.2)
6161

6262
PLATFORMS
6363
ruby
6464

6565
DEPENDENCIES
66-
cocoapods (~> 1.1.0.rc.2)
66+
cocoapods (~> 1.1.0.rc.3)
6767
minitest
6868

6969
BUNDLED WITH
70-
1.10.6
70+
1.13.1

‎CocoaPodsTests/test_running_validator.rb‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ class TestRunningValidator < Pod::Validator
99
attr_accessor :test_files
1010
attr_accessor :ios_simulator
1111
attr_accessor :tvos_simulator
12+
attr_accessor :watchos_simulator
1213

1314
def initialize(spec_or_path, source_urls)
1415
super(spec_or_path, source_urls)
1516
self.ios_simulator = :oldest
1617
self.tvos_simulator = :oldest
18+
self.watchos_simulator = :oldest
1719
end
1820

1921
def create_app_project
@@ -91,8 +93,11 @@ def run_tests
9193
when :tvos
9294
command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
9395
command += Fourflusher::SimControl.new.destination(tvos_simulator, 'tvOS', deployment_target)
96+
when :watchos
97+
# there's no XCTest on watchOS (https://openradar.appspot.com/21760513)
98+
return
9499
else
95-
return # skip watchos
100+
return
96101
end
97102

98103
output, status = _xcodebuild(command)

‎Documentation/Index.md‎

Lines changed: 13 additions & 10 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.10.1
81+
github "stephencelis/SQLite.swift" ~> 0.11.0
8282
```
8383
8484
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -93,37 +93,40 @@ install SQLite.swift with Carthage:
9393
9494
[CocoaPods][] is a dependency manager for Cocoa projects. To install SQLite.swift with CocoaPods:
9595
96-
1. Make sure the latest CocoaPods beta is [installed][CocoaPods Installation]. (SQLite.swift requires version 1.0.0.beta.6 or greater.)
96+
1. Verify that your copy of Xcode is installed in the default location (`/Application/Xcode.app`).
97+
98+
2. Make sure CocoaPods is [installed][CocoaPods Installation] (SQLite.swift requires version 1.0.0 or greater).
9799
98100
``` sh
99101
# Using the default Ruby install will require you to use sudo when
100102
# installing and updating gems.
101-
sudo gem install --pre cocoapods
103+
sudo gem install cocoapods
102104
```
103105
104-
2. Update your Podfile to include the following:
106+
3. Update your Podfile to include the following:
105107
106108
``` ruby
107109
use_frameworks!
108110
109-
pod 'SQLite.swift', '~> 0.10.1'
111+
pod 'SQLite.swift', '~> 0.11.0'
110112
```
111113
112-
3. Run `pod install`.
114+
4. Run `pod install`.
115+
113116
114117
#### Requiring a specific version of SQLite
115118
116119
If you want to use a more recent version of SQLite than what is provided with the OS you can require the `standalone` subspec:
117120
118121
``` ruby
119-
pod 'SQLite.swift/standalone', '~> 0.10.1'
122+
pod 'SQLite.swift/standalone', '~> 0.11.0'
120123
```
121124

122125
By default this will use the most recent version of SQLite without any extras. If you want you can further customize this by adding another dependency to sqlite3 or one of its subspecs:
123126

124127
``` ruby
125-
pod 'SQLite.swift/standalone', '~> 0.10.1'
126-
pod 'sqlite3/fts5', '= 3.11.1' # SQLite 3.11.1 with FTS5 enabled
128+
pod 'SQLite.swift/standalone', '~> 0.11.0'
129+
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
127130
```
128131

129132
See the [sqlite3 podspec][sqlite3pod] for more details.
@@ -139,7 +142,7 @@ To install SQLite.swift as an Xcode sub-project:
139142

140143
1. Drag the **SQLite.xcodeproj** file into your own project. ([Submodule](http://git-scm.com/book/en/Git-Tools-Submodules), clone, or [download](https://github.com/stephencelis/SQLite.swift/archive/master.zip) the project first.)
141144

142-
![Installation Screen Shot](Documentation/Resources/[email protected])
145+
![Installation Screen Shot](Resources/[email protected])
143146

144147
2. In your target’s **General** tab, click the **+** button under **Linked Frameworks and Libraries**.
145148

‎README.md‎

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

131131
```
132-
github "stephencelis/SQLite.swift" ~> 0.10.1
132+
github "stephencelis/SQLite.swift" ~> 0.11.0
133133
```
134134
135135
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -159,7 +159,7 @@ SQLite.swift with CocoaPods:
159159
``` ruby
160160
use_frameworks!
161161
162-
pod 'SQLite.swift', '~> 0.10.1'
162+
pod 'SQLite.swift', '~> 0.11.0'
163163
```
164164
165165
3. Run `pod install`.

‎SQLite.swift.podspec‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
#
2-
# `pod lib lint SQLite.swift.podspec' fails - see
3-
# https://github.com/CocoaPods/CocoaPods/issues/4607
4-
#
5-
61
Pod::Spec.new do |s|
72
s.name = "SQLite.swift"
8-
s.version = "0.10.1"
3+
s.version = "0.11.0"
94
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
105

116
s.description = <<-DESC

‎SQLite.xcodeproj/project.pbxproj‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,30 @@
5555
19A17E04C4C0956715C5676A /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
5656
19A17EC0D68BA8C03288ADF7 /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
5757
19A17FB80B94E882050AA908 /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
58+
3D67B3E61DB2469200A4F4C6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */; };
59+
3D67B3E71DB246BA00A4F4C6 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
60+
3D67B3E81DB246BA00A4F4C6 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
61+
3D67B3E91DB246D100A4F4C6 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF21C3F06E900AE3E12 /* Statement.swift */; };
62+
3D67B3EA1DB246D100A4F4C6 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF31C3F06E900AE3E12 /* Value.swift */; };
63+
3D67B3EB1DB246D100A4F4C6 /* FTS4.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF51C3F06E900AE3E12 /* FTS4.swift */; };
64+
3D67B3EC1DB246D100A4F4C6 /* RTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF61C3F06E900AE3E12 /* RTree.swift */; };
65+
3D67B3ED1DB246D100A4F4C6 /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
66+
3D67B3EE1DB246D100A4F4C6 /* AggregateFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFA1C3F06E900AE3E12 /* AggregateFunctions.swift */; };
67+
3D67B3EF1DB246D100A4F4C6 /* Collation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFB1C3F06E900AE3E12 /* Collation.swift */; };
68+
3D67B3F01DB246D100A4F4C6 /* CoreFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFC1C3F06E900AE3E12 /* CoreFunctions.swift */; };
69+
3D67B3F11DB246D100A4F4C6 /* CustomFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFD1C3F06E900AE3E12 /* CustomFunctions.swift */; };
70+
3D67B3F21DB246D100A4F4C6 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFE1C3F06E900AE3E12 /* Expression.swift */; };
71+
3D67B3F31DB246D100A4F4C6 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFF1C3F06E900AE3E12 /* Operators.swift */; };
72+
3D67B3F41DB246D100A4F4C6 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B001C3F06E900AE3E12 /* Query.swift */; };
73+
3D67B3F51DB246D100A4F4C6 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B011C3F06E900AE3E12 /* Schema.swift */; };
74+
3D67B3F61DB246D100A4F4C6 /* Setter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B021C3F06E900AE3E12 /* Setter.swift */; };
75+
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
76+
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
77+
3D67B3F91DB246E700A4F4C6 /* SQLite-Bridging.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLite-Bridging.m */; };
78+
3D67B3FA1DB2470600A4F4C6 /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
79+
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
80+
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
81+
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
5882
EE247AD71C3F04ED00AE3E12 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
5983
EE247ADE1C3F04ED00AE3E12 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE247AD31C3F04ED00AE3E12 /* SQLite.framework */; };
6084
EE247B031C3F06E900AE3E12 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
@@ -173,6 +197,7 @@
173197
39548A6B1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
174198
39548A6D1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
175199
39548A6F1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
200+
3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
176201
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
177202
EE247AD31C3F04ED00AE3E12 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
178203
EE247AD61C3F04ED00AE3E12 /* SQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = "<group>"; };
@@ -250,6 +275,7 @@
250275
isa = PBXFrameworksBuildPhase;
251276
buildActionMask = 2147483647;
252277
files = (
278+
3D67B3E61DB2469200A4F4C6 /* libsqlite3.tbd in Frameworks */,
253279
);
254280
runOnlyForDeploymentPostprocessing = 0;
255281
};
@@ -358,13 +384,22 @@
358384
path = watchsimulator;
359385
sourceTree = "<group>";
360386
};
387+
3D67B3E41DB2469200A4F4C6 /* Frameworks */ = {
388+
isa = PBXGroup;
389+
children = (
390+
3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */,
391+
);
392+
name = Frameworks;
393+
sourceTree = "<group>";
394+
};
361395
EE247AC91C3F04ED00AE3E12 = {
362396
isa = PBXGroup;
363397
children = (
364398
EE247AD51C3F04ED00AE3E12 /* SQLite */,
365399
EE247AE11C3F04ED00AE3E12 /* SQLiteTests */,
366400
EE247B8A1C3F81D000AE3E12 /* Metadata */,
367401
EE247AD41C3F04ED00AE3E12 /* Products */,
402+
3D67B3E41DB2469200A4F4C6 /* Frameworks */,
368403
);
369404
indentWidth = 4;
370405
sourceTree = "<group>";
@@ -517,6 +552,10 @@
517552
isa = PBXHeadersBuildPhase;
518553
buildActionMask = 2147483647;
519554
files = (
555+
3D67B3FA1DB2470600A4F4C6 /* usr/include/sqlite3.h in Headers */,
556+
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */,
557+
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */,
558+
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */,
520559
);
521560
runOnlyForDeploymentPostprocessing = 0;
522561
};
@@ -837,6 +876,25 @@
837876
isa = PBXSourcesBuildPhase;
838877
buildActionMask = 2147483647;
839878
files = (
879+
3D67B3F91DB246E700A4F4C6 /* SQLite-Bridging.m in Sources */,
880+
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */,
881+
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */,
882+
3D67B3E91DB246D100A4F4C6 /* Statement.swift in Sources */,
883+
3D67B3EA1DB246D100A4F4C6 /* Value.swift in Sources */,
884+
3D67B3EB1DB246D100A4F4C6 /* FTS4.swift in Sources */,
885+
3D67B3EC1DB246D100A4F4C6 /* RTree.swift in Sources */,
886+
3D67B3ED1DB246D100A4F4C6 /* FTS5.swift in Sources */,
887+
3D67B3EE1DB246D100A4F4C6 /* AggregateFunctions.swift in Sources */,
888+
3D67B3EF1DB246D100A4F4C6 /* Collation.swift in Sources */,
889+
3D67B3F01DB246D100A4F4C6 /* CoreFunctions.swift in Sources */,
890+
3D67B3F11DB246D100A4F4C6 /* CustomFunctions.swift in Sources */,
891+
3D67B3F21DB246D100A4F4C6 /* Expression.swift in Sources */,
892+
3D67B3F31DB246D100A4F4C6 /* Operators.swift in Sources */,
893+
3D67B3F41DB246D100A4F4C6 /* Query.swift in Sources */,
894+
3D67B3F51DB246D100A4F4C6 /* Schema.swift in Sources */,
895+
3D67B3F61DB246D100A4F4C6 /* Setter.swift in Sources */,
896+
3D67B3E71DB246BA00A4F4C6 /* Blob.swift in Sources */,
897+
3D67B3E81DB246BA00A4F4C6 /* Connection.swift in Sources */,
840898
);
841899
runOnlyForDeploymentPostprocessing = 0;
842900
};
@@ -1050,6 +1108,8 @@
10501108
PRODUCT_NAME = SQLite;
10511109
SDKROOT = watchos;
10521110
SKIP_INSTALL = YES;
1111+
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
1112+
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
10531113
SWIFT_VERSION = 3.0;
10541114
TARGETED_DEVICE_FAMILY = 4;
10551115
WATCHOS_DEPLOYMENT_TARGET = 2.2;
@@ -1073,6 +1133,8 @@
10731133
PRODUCT_NAME = SQLite;
10741134
SDKROOT = watchos;
10751135
SKIP_INSTALL = YES;
1136+
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
1137+
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
10761138
SWIFT_VERSION = 3.0;
10771139
TARGETED_DEVICE_FAMILY = 4;
10781140
WATCHOS_DEPLOYMENT_TARGET = 2.2;

0 commit comments

Comments
 (0)