From 6ee39fca194c00c6a34fc1525f440f20ef4f25e2 Mon Sep 17 00:00:00 2001 From: Geoff Date: Thu, 24 Mar 2016 09:33:09 -0600 Subject: [PATCH 1/9] Updated to bring changes from SQLite.swift changes since Jan 10 --- Vendor/SQLite.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vendor/SQLite.swift b/Vendor/SQLite.swift index 1ae2063..7c6fe7e 160000 --- a/Vendor/SQLite.swift +++ b/Vendor/SQLite.swift @@ -1 +1 @@ -Subproject commit 1ae20631b6a7942ae375d881dbfafbec8449bc58 +Subproject commit 7c6fe7ec02cafe32e6223d6fadf74b127373ae3e From 202876f9da3f974be5c3662b203a49331e0b052f Mon Sep 17 00:00:00 2001 From: Geoff Date: Thu, 24 Mar 2016 10:50:18 -0600 Subject: [PATCH 2/9] Adding schemes for the SQLiteCipher and SQLiteCipherTests targets --- .../xcschemes/SQLiteCipher.xcscheme | 80 +++++++++++++++++++ .../xcschemes/SQLiteCipherTests.xcscheme | 56 +++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme create mode 100644 SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme diff --git a/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme new file mode 100644 index 0000000..49c1dc2 --- /dev/null +++ b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme new file mode 100644 index 0000000..2fb4d44 --- /dev/null +++ b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 2f9f984ea5fe57a0ea0052fb5a89d9d3258437e3 Mon Sep 17 00:00:00 2001 From: Geoff Date: Fri, 25 Mar 2016 13:21:20 -0600 Subject: [PATCH 3/9] Removed Swift Search Paths --- SQLiteCipher.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SQLiteCipher.xcodeproj/project.pbxproj b/SQLiteCipher.xcodeproj/project.pbxproj index e2d6cc7..e8653c3 100644 --- a/SQLiteCipher.xcodeproj/project.pbxproj +++ b/SQLiteCipher.xcodeproj/project.pbxproj @@ -563,6 +563,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteCipher; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_INCLUDE_PATHS = ""; }; name = Debug; }; @@ -581,6 +582,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteCipher; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_INCLUDE_PATHS = ""; }; name = Release; }; From 5e63acc591945dcdf9efa66ea0f9bcf9cb87f29a Mon Sep 17 00:00:00 2001 From: Geoff Date: Fri, 25 Mar 2016 13:26:17 -0600 Subject: [PATCH 4/9] Updated SQLite.swift --- Vendor/SQLite.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vendor/SQLite.swift b/Vendor/SQLite.swift index 7c6fe7e..29c2faf 160000 --- a/Vendor/SQLite.swift +++ b/Vendor/SQLite.swift @@ -1 +1 @@ -Subproject commit 7c6fe7ec02cafe32e6223d6fadf74b127373ae3e +Subproject commit 29c2fafc91a722ba8dba77816726e60cf38b916b From dc32d53530bcb3af1961ffb1d4564148ae0b8539 Mon Sep 17 00:00:00 2001 From: Geoff Date: Fri, 25 Mar 2016 13:26:29 -0600 Subject: [PATCH 5/9] Commented out import statement for SQLite3 --- SQLiteCipher/Cipher.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQLiteCipher/Cipher.swift b/SQLiteCipher/Cipher.swift index 5fdda13..d3a8f8d 100644 --- a/SQLiteCipher/Cipher.swift +++ b/SQLiteCipher/Cipher.swift @@ -22,7 +22,7 @@ // THE SOFTWARE. // -import SQLite3 +//import SQLite3 extension Connection { From 12518ee4eb71b6fa0cb510043a654a039b3d4fd0 Mon Sep 17 00:00:00 2001 From: Geoff Date: Fri, 25 Mar 2016 13:38:34 -0600 Subject: [PATCH 6/9] Made local extension here to make SQLite.swift build --- SQLiteCipher.xcodeproj/project.pbxproj | 4 ++++ SQLiteCipher/Foundation+extension.swift | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 SQLiteCipher/Foundation+extension.swift diff --git a/SQLiteCipher.xcodeproj/project.pbxproj b/SQLiteCipher.xcodeproj/project.pbxproj index e8653c3..c473c09 100644 --- a/SQLiteCipher.xcodeproj/project.pbxproj +++ b/SQLiteCipher.xcodeproj/project.pbxproj @@ -32,6 +32,7 @@ 80EC45611C4316CD00BADFB1 /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80EC45601C4316CD00BADFB1 /* Cipher.swift */; }; 80EC45631C43188800BADFB1 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 80EC45621C43188800BADFB1 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; }; 80EC45691C43197700BADFB1 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80EC44D51C4315A900BADFB1 /* libsqlcipher.a */; }; + 9C1B9D511CA5C93500EF0A1E /* Foundation+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -116,6 +117,7 @@ 80EC45481C43169C00BADFB1 /* Setter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Setter.swift; sourceTree = ""; }; 80EC45601C4316CD00BADFB1 /* Cipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cipher.swift; sourceTree = ""; }; 80EC45621C43188800BADFB1 /* SQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = ""; }; + 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Foundation+extension.swift"; path = "SQLiteCipher/Foundation+extension.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -141,6 +143,7 @@ 80EC448F1C4314EE00BADFB1 = { isa = PBXGroup; children = ( + 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */, 80EC449B1C4314EE00BADFB1 /* SQLiteCipher */, 80EC44A71C4314EE00BADFB1 /* SQLiteCipherTests */, 80EC449A1C4314EE00BADFB1 /* Products */, @@ -412,6 +415,7 @@ 80EC454F1C43169C00BADFB1 /* Blob.swift in Sources */, 80EC45611C4316CD00BADFB1 /* Cipher.swift in Sources */, 80EC45561C43169C00BADFB1 /* R*Tree.swift in Sources */, + 9C1B9D511CA5C93500EF0A1E /* Foundation+extension.swift in Sources */, 80EC45521C43169C00BADFB1 /* SQLite-Bridging.m in Sources */, 80EC45541C43169C00BADFB1 /* Value.swift in Sources */, 80EC455B1C43169C00BADFB1 /* Expression.swift in Sources */, diff --git a/SQLiteCipher/Foundation+extension.swift b/SQLiteCipher/Foundation+extension.swift new file mode 100644 index 0000000..6c54143 --- /dev/null +++ b/SQLiteCipher/Foundation+extension.swift @@ -0,0 +1,15 @@ +// +// Foundation+extension.swift +// SQLiteCipher +// +// Created by Geoffrey Blotter on 3/25/16. +// Copyright © 2016 Stephen Celis. All rights reserved. +// + +import Foundation + +extension NSData { + + public typealias Datatype = Blob.Datatype + +} From 0fd1354f5ff746fa5da8a796a5c4c04e8e27a28f Mon Sep 17 00:00:00 2001 From: Geoff Date: Fri, 25 Mar 2016 13:50:21 -0600 Subject: [PATCH 7/9] Moved file inside directory --- SQLiteCipher.xcodeproj/project.pbxproj | 49 ++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/SQLiteCipher.xcodeproj/project.pbxproj b/SQLiteCipher.xcodeproj/project.pbxproj index c473c09..2f596a9 100644 --- a/SQLiteCipher.xcodeproj/project.pbxproj +++ b/SQLiteCipher.xcodeproj/project.pbxproj @@ -85,6 +85,27 @@ remoteGlobalIDString = D2AAC045055464E500DB518D; remoteInfo = sqlcipher; }; + 9C1B9D821CA5CDED00EF0A1E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 80EC44B31C43159800BADFB1 /* SQLite.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 03A65E5A1C6BB0F50062603F; + remoteInfo = "SQLite tvOS"; + }; + 9C1B9D841CA5CDED00EF0A1E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 80EC44B31C43159800BADFB1 /* SQLite.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 03A65E631C6BB0F60062603F; + remoteInfo = "SQLiteTests tvOS"; + }; + 9C1B9D861CA5CDED00EF0A1E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 80EC44B31C43159800BADFB1 /* SQLite.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A121AC451CA35C79005A31D1; + remoteInfo = "SQLite watchOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -117,7 +138,7 @@ 80EC45481C43169C00BADFB1 /* Setter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Setter.swift; sourceTree = ""; }; 80EC45601C4316CD00BADFB1 /* Cipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cipher.swift; sourceTree = ""; }; 80EC45621C43188800BADFB1 /* SQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = ""; }; - 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Foundation+extension.swift"; path = "SQLiteCipher/Foundation+extension.swift"; sourceTree = ""; }; + 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Foundation+extension.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -143,7 +164,6 @@ 80EC448F1C4314EE00BADFB1 = { isa = PBXGroup; children = ( - 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */, 80EC449B1C4314EE00BADFB1 /* SQLiteCipher */, 80EC44A71C4314EE00BADFB1 /* SQLiteCipherTests */, 80EC449A1C4314EE00BADFB1 /* Products */, @@ -167,6 +187,7 @@ 80EC449C1C4314EE00BADFB1 /* SQLiteCipher.h */, 80EC449E1C4314EE00BADFB1 /* Info.plist */, 80EC45601C4316CD00BADFB1 /* Cipher.swift */, + 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */, 80EC454A1C43169C00BADFB1 /* SQLite */, ); path = SQLiteCipher; @@ -188,6 +209,9 @@ 80EC452F1C43169400BADFB1 /* SQLiteTests iOS.xctest */, 80EC44C41C43159800BADFB1 /* SQLite.framework */, 80EC45311C43169400BADFB1 /* SQLiteTests Mac.xctest */, + 9C1B9D831CA5CDED00EF0A1E /* SQLite.framework */, + 9C1B9D851CA5CDED00EF0A1E /* SQLiteTests tvOS.xctest */, + 9C1B9D871CA5CDED00EF0A1E /* SQLite.framework */, ); name = Products; sourceTree = ""; @@ -387,6 +411,27 @@ remoteRef = 80EC45301C43169400BADFB1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 9C1B9D831CA5CDED00EF0A1E /* SQLite.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = SQLite.framework; + remoteRef = 9C1B9D821CA5CDED00EF0A1E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9C1B9D851CA5CDED00EF0A1E /* SQLiteTests tvOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "SQLiteTests tvOS.xctest"; + remoteRef = 9C1B9D841CA5CDED00EF0A1E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9C1B9D871CA5CDED00EF0A1E /* SQLite.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = SQLite.framework; + remoteRef = 9C1B9D861CA5CDED00EF0A1E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ From bb4f22850df2c6b6088cdc707d317148d9edda3f Mon Sep 17 00:00:00 2001 From: Geoff Date: Fri, 25 Mar 2016 14:17:03 -0600 Subject: [PATCH 8/9] Made project dependent on the SQLite.swift framework in the project file --- SQLiteCipher.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SQLiteCipher.xcodeproj/project.pbxproj b/SQLiteCipher.xcodeproj/project.pbxproj index 2f596a9..e980949 100644 --- a/SQLiteCipher.xcodeproj/project.pbxproj +++ b/SQLiteCipher.xcodeproj/project.pbxproj @@ -33,6 +33,7 @@ 80EC45631C43188800BADFB1 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 80EC45621C43188800BADFB1 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; }; 80EC45691C43197700BADFB1 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80EC44D51C4315A900BADFB1 /* libsqlcipher.a */; }; 9C1B9D511CA5C93500EF0A1E /* Foundation+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */; }; + 9CEC27C01CA5D3BB002AA033 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80EC44C01C43159800BADFB1 /* SQLite.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -146,6 +147,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 9CEC27C01CA5D3BB002AA033 /* SQLite.framework in Frameworks */, 80EC45691C43197700BADFB1 /* libsqlcipher.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; From e6579d90ed6b0782642b4534d2752139a7501fc7 Mon Sep 17 00:00:00 2001 From: Geoff Date: Mon, 28 Mar 2016 12:48:36 -0600 Subject: [PATCH 9/9] Updated submodule to master --- Vendor/SQLite.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vendor/SQLite.swift b/Vendor/SQLite.swift index 29c2faf..b43a31f 160000 --- a/Vendor/SQLite.swift +++ b/Vendor/SQLite.swift @@ -1 +1 @@ -Subproject commit 29c2fafc91a722ba8dba77816726e60cf38b916b +Subproject commit b43a31f9020c42790d763a2cbf4af0b57aed5ab9