From 3dacf3b00d9e5ed41cd1dd13a0279b62ed109128 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 12:12:58 +0200 Subject: [PATCH 01/11] Prepare 0.11.0 --- Documentation/Index.md | 8 ++++---- README.md | 4 ++-- SQLite.swift.podspec | 2 +- SQLite/Info.plist | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/Index.md b/Documentation/Index.md index 91f631ef..3ecbbf77 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -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]. @@ -106,7 +106,7 @@ install SQLite.swift with Carthage: ``` ruby use_frameworks! - pod 'SQLite.swift', '~> 0.10.1' + pod 'SQLite.swift', '~> 0.11.0' ``` 3. Run `pod install`. @@ -116,13 +116,13 @@ install SQLite.swift with Carthage: 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 'SQLite.swift/standalone', '~> 0.11.0' pod 'sqlite3/fts5', '= 3.11.1' # SQLite 3.11.1 with FTS5 enabled ``` diff --git a/README.md b/README.md index 87d283d6..6e9857bd 100644 --- a/README.md +++ b/README.md @@ -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]. @@ -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`. diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec index b7a09bc1..a6efaf2a 100644 --- a/SQLite.swift.podspec +++ b/SQLite.swift.podspec @@ -5,7 +5,7 @@ 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 diff --git a/SQLite/Info.plist b/SQLite/Info.plist index d93473a7..03d53553 100644 --- a/SQLite/Info.plist +++ b/SQLite/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.1 + 0.11.0 CFBundleSignature ???? CFBundleVersion From f160b86be47735b69262a00d713b796a29cf2f89 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 12:25:47 +0200 Subject: [PATCH 02/11] Docs --- Documentation/Index.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/Index.md b/Documentation/Index.md index 3ecbbf77..ac8bfa3e 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -93,15 +93,17 @@ 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! @@ -109,7 +111,8 @@ install SQLite.swift with Carthage: pod 'SQLite.swift', '~> 0.11.0' ``` - 3. Run `pod install`. + 4. Run `pod install`. + #### Requiring a specific version of SQLite From 89102d79a39e68dee15b5e79554baecd0f823396 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 12:30:07 +0200 Subject: [PATCH 03/11] Update SQLite version --- Documentation/Index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Index.md b/Documentation/Index.md index ac8bfa3e..3940541b 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -126,7 +126,7 @@ By default this will use the most recent version of SQLite without any extras. I ``` ruby pod 'SQLite.swift/standalone', '~> 0.11.0' - pod 'sqlite3/fts5', '= 3.11.1' # SQLite 3.11.1 with FTS5 enabled + pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled ``` See the [sqlite3 podspec][sqlite3pod] for more details. From d3d2e4e72b15624d0e0ca1e3814d5e4279daa335 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 12:31:38 +0200 Subject: [PATCH 04/11] Fix screenshot path --- Documentation/Index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Index.md b/Documentation/Index.md index 3940541b..6107969a 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -142,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/installation@2x.png) + ![Installation Screen Shot](Resources/installation@2x.png) 2. In your target’s **General** tab, click the **+** button under **Linked Frameworks and Libraries**. From 0a89b1b7dcdcd5a22830a966a025b6c9c451852f Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 12:45:34 +0200 Subject: [PATCH 05/11] Spec lints OK now --- SQLite.swift.podspec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec index a6efaf2a..9c3a35e0 100644 --- a/SQLite.swift.podspec +++ b/SQLite.swift.podspec @@ -1,8 +1,3 @@ -# -# `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.11.0" From 18aad56f33410ae295eb45459b0d84bc1b4d76ce Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 13:07:35 +0200 Subject: [PATCH 06/11] Add watchOS scheme --- CocoaPodsTests/test_running_validator.rb | 7 +- SQLite.xcodeproj/project.pbxproj | 4 + .../xcschemes/SQLite watchOS.xcscheme | 80 +++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme diff --git a/CocoaPodsTests/test_running_validator.rb b/CocoaPodsTests/test_running_validator.rb index 1eefa4b8..1a06e48a 100644 --- a/CocoaPodsTests/test_running_validator.rb +++ b/CocoaPodsTests/test_running_validator.rb @@ -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 @@ -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 + command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator) + command += Fourflusher::SimControl.new.destination(watchos_simulator, 'watchOS', deployment_target) else - return # skip watchos + return end output, status = _xcodebuild(command) diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index 4dddeaaf..690a1bea 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -1043,6 +1043,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; + "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; INFOPLIST_FILE = SQLite/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1066,6 +1068,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; + "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; INFOPLIST_FILE = SQLite/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme new file mode 100644 index 00000000..d2088e81 --- /dev/null +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 15887ae7730e76b76c94757498f3a2c6ea408cd8 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 13:11:06 +0200 Subject: [PATCH 07/11] Swift incude paths --- SQLite.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index 690a1bea..f0b18841 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -1043,8 +1043,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; - "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; + "SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; + "SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; INFOPLIST_FILE = SQLite/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1068,8 +1068,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; - "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; + "SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; + "SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; INFOPLIST_FILE = SQLite/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; From dd2568fa23377bd281c270937977a5efc5b82919 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 13:15:44 +0200 Subject: [PATCH 08/11] Add files to watchOS target --- SQLite.xcodeproj/project.pbxproj | 66 ++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index f0b18841..7b33eac6 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -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 */; }; @@ -173,6 +197,7 @@ 39548A6B1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 39548A6D1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 39548A6F1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; + 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 = ""; }; @@ -250,6 +275,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3D67B3E61DB2469200A4F4C6 /* libsqlite3.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -358,6 +384,14 @@ path = watchsimulator; sourceTree = ""; }; + 3D67B3E41DB2469200A4F4C6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */, + ); + name = Frameworks; + sourceTree = ""; + }; EE247AC91C3F04ED00AE3E12 = { isa = PBXGroup; children = ( @@ -365,6 +399,7 @@ EE247AE11C3F04ED00AE3E12 /* SQLiteTests */, EE247B8A1C3F81D000AE3E12 /* Metadata */, EE247AD41C3F04ED00AE3E12 /* Products */, + 3D67B3E41DB2469200A4F4C6 /* Frameworks */, ); indentWidth = 4; sourceTree = ""; @@ -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; }; @@ -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; }; @@ -1043,8 +1101,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - "SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; - "SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; INFOPLIST_FILE = SQLite/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1052,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; @@ -1068,8 +1126,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - "SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos"; - "SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator"; INFOPLIST_FILE = SQLite/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1077,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; From 9bed4fcb6db633a40996037f0ca8cfab325c5f42 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 13:28:29 +0200 Subject: [PATCH 09/11] Update bundle --- CocoaPodsTests/Gemfile | 2 +- CocoaPodsTests/Gemfile.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CocoaPodsTests/Gemfile b/CocoaPodsTests/Gemfile index 287dcbfc..29e72332 100644 --- a/CocoaPodsTests/Gemfile +++ b/CocoaPodsTests/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'cocoapods', '~> 1.1.0.rc.2' +gem 'cocoapods', '~> 1.1.0.rc.3' gem 'minitest' diff --git a/CocoaPodsTests/Gemfile.lock b/CocoaPodsTests/Gemfile.lock index 93a54bb9..f8cc1118 100644 --- a/CocoaPodsTests/Gemfile.lock +++ b/CocoaPodsTests/Gemfile.lock @@ -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) @@ -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 From e68f8da46e3025e8e281fb3eb1061073e75bcc9f Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 13:55:08 +0200 Subject: [PATCH 10/11] Don't print logs after failure --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 925ceee3..d28be8de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 7d63509c5007550ea71b03cf1117bce0fba3bfbf Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sat, 15 Oct 2016 14:07:31 +0200 Subject: [PATCH 11/11] skip watchOS --- CocoaPodsTests/test_running_validator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CocoaPodsTests/test_running_validator.rb b/CocoaPodsTests/test_running_validator.rb index 1a06e48a..949e8489 100644 --- a/CocoaPodsTests/test_running_validator.rb +++ b/CocoaPodsTests/test_running_validator.rb @@ -94,8 +94,8 @@ def run_tests command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator) command += Fourflusher::SimControl.new.destination(tvos_simulator, 'tvOS', deployment_target) when :watchos - command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator) - command += Fourflusher::SimControl.new.destination(watchos_simulator, 'watchOS', deployment_target) + # there's no XCTest on watchOS (https://openradar.appspot.com/21760513) + return else return end