Skip to content

Prepare and publish 0.11.0 #524

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 11 commits into from
Oct 19, 2016
Merged

Prepare and publish 0.11.0 #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3dacf3b
Prepare 0.11.0
jberkel Oct 15, 2016
f160b86
Docs
jberkel Oct 15, 2016
89102d7
Update SQLite version
jberkel Oct 15, 2016
d3d2e4e
Fix screenshot path
jberkel Oct 15, 2016
0a89b1b
Spec lints OK now
jberkel Oct 15, 2016
18aad56
Add watchOS scheme
jberkel Oct 15, 2016
15887ae
Swift incude paths
jberkel Oct 15, 2016
dd2568f
Add files to watchOS target
jberkel Oct 15, 2016
9bed4fc
Update bundle
jberkel Oct 15, 2016
e68f8da
Don't print logs after failure
jberkel Oct 15, 2016
7d63509
skip watchOS
jberkel Oct 15, 2016
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
3 changes: 0 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ before_install:
- gem install xcpretty --no-document
script:
- ./run-tests.sh
after_failure:
- find $HOME/Library/Developer/Xcode/DerivedData/ -name '*.log' -print0 | xargs -0 cat
- cat /var/log/system.log
2 changes: 1 addition & 1 deletion CocoaPodsTests/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 1.1.0.rc.2'
gem 'cocoapods', '~> 1.1.0.rc.3'
gem 'minitest'
30 changes: 15 additions & 15 deletions CocoaPodsTests/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0)
cocoapods (1.1.0.rc.2)
claide (1.0.1)
cocoapods (1.1.0.rc.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.1.0.rc.2)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.1.0.rc.3)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.1, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.0.0, < 2.0)
cocoapods-trunk (= 1.1.0.beta.1)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 1.0.1)
fourflusher (~> 2.0)
gh_inspector (~> 1.0)
molinillo (~> 0.5.1)
nap (~> 1.0)
xcodeproj (>= 1.3.1, < 2.0)
cocoapods-core (1.1.0.rc.2)
xcodeproj (>= 1.3.2, < 2.0)
cocoapods-core (1.1.0.rc.3)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand All @@ -36,35 +36,35 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.0.0)
cocoapods-trunk (1.1.0.beta.1)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.1.0)
colored (1.2)
escape (0.0.4)
fourflusher (1.0.1)
fourflusher (2.0.0)
fuzzy_match (2.0.4)
gh_inspector (1.0.2)
i18n (0.7.0)
json (1.8.3)
minitest (5.9.0)
minitest (5.9.1)
molinillo (0.5.1)
nap (1.1.0)
netrc (0.7.8)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.3.1)
xcodeproj (1.3.2)
activesupport (>= 3)
claide (>= 1.0.0, < 2.0)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.1.0.rc.2)
cocoapods (~> 1.1.0.rc.3)
minitest

BUNDLED WITH
1.10.6
1.13.1
7 changes: 6 additions & 1 deletion CocoaPodsTests/test_running_validator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ class TestRunningValidator < Pod::Validator
attr_accessor :test_files
attr_accessor :ios_simulator
attr_accessor :tvos_simulator
attr_accessor :watchos_simulator

def initialize(spec_or_path, source_urls)
super(spec_or_path, source_urls)
self.ios_simulator = :oldest
self.tvos_simulator = :oldest
self.watchos_simulator = :oldest
end

def create_app_project
Expand Down Expand Up @@ -91,8 +93,11 @@ def run_tests
when :tvos
command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
command += Fourflusher::SimControl.new.destination(tvos_simulator, 'tvOS', deployment_target)
when :watchos
# there's no XCTest on watchOS (https://openradar.appspot.com/21760513)
return
else
return # skip watchos
return
end

output, status = _xcodebuild(command)
Expand Down
23 changes: 13 additions & 10 deletions Documentation/Index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ install SQLite.swift with Carthage:
2. Update your Cartfile to include the following:

```
github "stephencelis/SQLite.swift" ~> 0.10.1
github "stephencelis/SQLite.swift" ~> 0.11.0
```

3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
Expand All @@ -93,37 +93,40 @@ install SQLite.swift with Carthage:

[CocoaPods][] is a dependency manager for Cocoa projects. To install SQLite.swift with CocoaPods:

1. Make sure the latest CocoaPods beta is [installed][CocoaPods Installation]. (SQLite.swift requires version 1.0.0.beta.6 or greater.)
1. Verify that your copy of Xcode is installed in the default location (`/Application/Xcode.app`).

2. Make sure CocoaPods is [installed][CocoaPods Installation] (SQLite.swift requires version 1.0.0 or greater).

``` sh
# Using the default Ruby install will require you to use sudo when
# installing and updating gems.
sudo gem install --pre cocoapods
sudo gem install cocoapods
```

2. Update your Podfile to include the following:
3. Update your Podfile to include the following:

``` ruby
use_frameworks!

pod 'SQLite.swift', '~> 0.10.1'
pod 'SQLite.swift', '~> 0.11.0'
```

3. Run `pod install`.
4. Run `pod install`.


#### Requiring a specific version of SQLite

If you want to use a more recent version of SQLite than what is provided with the OS you can require the `standalone` subspec:

``` ruby
pod 'SQLite.swift/standalone', '~> 0.10.1'
pod 'SQLite.swift/standalone', '~> 0.11.0'
```

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:

``` ruby
pod 'SQLite.swift/standalone', '~> 0.10.1'
pod 'sqlite3/fts5', '= 3.11.1' # SQLite 3.11.1 with FTS5 enabled
pod 'SQLite.swift/standalone', '~> 0.11.0'
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
```

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

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.)

![Installation Screen Shot](Documentation/Resources/[email protected])
![Installation Screen Shot](Resources/[email protected])

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

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ install SQLite.swift with Carthage:
2. Update your Cartfile to include the following:

```
github "stephencelis/SQLite.swift" ~> 0.10.1
github "stephencelis/SQLite.swift" ~> 0.11.0
```

3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
Expand Down Expand Up @@ -159,7 +159,7 @@ SQLite.swift with CocoaPods:
``` ruby
use_frameworks!

pod 'SQLite.swift', '~> 0.10.1'
pod 'SQLite.swift', '~> 0.11.0'
```

3. Run `pod install`.
Expand Down
7 changes: 1 addition & 6 deletions SQLite.swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#
# `pod lib lint SQLite.swift.podspec' fails - see
# https://github.com/CocoaPods/CocoaPods/issues/4607
#

Pod::Spec.new do |s|
s.name = "SQLite.swift"
s.version = "0.10.1"
s.version = "0.11.0"
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."

s.description = <<-DESC
Expand Down
62 changes: 62 additions & 0 deletions SQLite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,30 @@
19A17E04C4C0956715C5676A /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
19A17EC0D68BA8C03288ADF7 /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
19A17FB80B94E882050AA908 /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
3D67B3E61DB2469200A4F4C6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */; };
3D67B3E71DB246BA00A4F4C6 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
3D67B3E81DB246BA00A4F4C6 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
3D67B3E91DB246D100A4F4C6 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF21C3F06E900AE3E12 /* Statement.swift */; };
3D67B3EA1DB246D100A4F4C6 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF31C3F06E900AE3E12 /* Value.swift */; };
3D67B3EB1DB246D100A4F4C6 /* FTS4.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF51C3F06E900AE3E12 /* FTS4.swift */; };
3D67B3EC1DB246D100A4F4C6 /* RTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF61C3F06E900AE3E12 /* RTree.swift */; };
3D67B3ED1DB246D100A4F4C6 /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
3D67B3EE1DB246D100A4F4C6 /* AggregateFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFA1C3F06E900AE3E12 /* AggregateFunctions.swift */; };
3D67B3EF1DB246D100A4F4C6 /* Collation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFB1C3F06E900AE3E12 /* Collation.swift */; };
3D67B3F01DB246D100A4F4C6 /* CoreFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFC1C3F06E900AE3E12 /* CoreFunctions.swift */; };
3D67B3F11DB246D100A4F4C6 /* CustomFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFD1C3F06E900AE3E12 /* CustomFunctions.swift */; };
3D67B3F21DB246D100A4F4C6 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFE1C3F06E900AE3E12 /* Expression.swift */; };
3D67B3F31DB246D100A4F4C6 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AFF1C3F06E900AE3E12 /* Operators.swift */; };
3D67B3F41DB246D100A4F4C6 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B001C3F06E900AE3E12 /* Query.swift */; };
3D67B3F51DB246D100A4F4C6 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B011C3F06E900AE3E12 /* Schema.swift */; };
3D67B3F61DB246D100A4F4C6 /* Setter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B021C3F06E900AE3E12 /* Setter.swift */; };
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
3D67B3F91DB246E700A4F4C6 /* SQLite-Bridging.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLite-Bridging.m */; };
3D67B3FA1DB2470600A4F4C6 /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
EE247AD71C3F04ED00AE3E12 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
EE247ADE1C3F04ED00AE3E12 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE247AD31C3F04ED00AE3E12 /* SQLite.framework */; };
EE247B031C3F06E900AE3E12 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
Expand Down Expand Up @@ -173,6 +197,7 @@
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>"; };
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; };
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 @@ -250,6 +275,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3D67B3E61DB2469200A4F4C6 /* libsqlite3.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -358,13 +384,22 @@
path = watchsimulator;
sourceTree = "<group>";
};
3D67B3E41DB2469200A4F4C6 /* Frameworks */ = {
isa = PBXGroup;
children = (
3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */,
);
name = Frameworks;
sourceTree = "<group>";
};
EE247AC91C3F04ED00AE3E12 = {
isa = PBXGroup;
children = (
EE247AD51C3F04ED00AE3E12 /* SQLite */,
EE247AE11C3F04ED00AE3E12 /* SQLiteTests */,
EE247B8A1C3F81D000AE3E12 /* Metadata */,
EE247AD41C3F04ED00AE3E12 /* Products */,
3D67B3E41DB2469200A4F4C6 /* Frameworks */,
);
indentWidth = 4;
sourceTree = "<group>";
Expand Down Expand Up @@ -517,6 +552,10 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
3D67B3FA1DB2470600A4F4C6 /* usr/include/sqlite3.h in Headers */,
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */,
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */,
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -837,6 +876,25 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3D67B3F91DB246E700A4F4C6 /* SQLite-Bridging.m in Sources */,
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */,
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */,
3D67B3E91DB246D100A4F4C6 /* Statement.swift in Sources */,
3D67B3EA1DB246D100A4F4C6 /* Value.swift in Sources */,
3D67B3EB1DB246D100A4F4C6 /* FTS4.swift in Sources */,
3D67B3EC1DB246D100A4F4C6 /* RTree.swift in Sources */,
3D67B3ED1DB246D100A4F4C6 /* FTS5.swift in Sources */,
3D67B3EE1DB246D100A4F4C6 /* AggregateFunctions.swift in Sources */,
3D67B3EF1DB246D100A4F4C6 /* Collation.swift in Sources */,
3D67B3F01DB246D100A4F4C6 /* CoreFunctions.swift in Sources */,
3D67B3F11DB246D100A4F4C6 /* CustomFunctions.swift in Sources */,
3D67B3F21DB246D100A4F4C6 /* Expression.swift in Sources */,
3D67B3F31DB246D100A4F4C6 /* Operators.swift in Sources */,
3D67B3F41DB246D100A4F4C6 /* Query.swift in Sources */,
3D67B3F51DB246D100A4F4C6 /* Schema.swift in Sources */,
3D67B3F61DB246D100A4F4C6 /* Setter.swift in Sources */,
3D67B3E71DB246BA00A4F4C6 /* Blob.swift in Sources */,
3D67B3E81DB246BA00A4F4C6 /* Connection.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1050,6 +1108,8 @@
PRODUCT_NAME = SQLite;
SDKROOT = watchos;
SKIP_INSTALL = YES;
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
Expand All @@ -1073,6 +1133,8 @@
PRODUCT_NAME = SQLite;
SDKROOT = watchos;
SKIP_INSTALL = YES;
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
Expand Down
Loading