-
Notifications
You must be signed in to change notification settings - Fork 11
Resolve build issues #1
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.
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
Open
agisboye
wants to merge
6
commits into
stephencelis:master
Choose a base branch
from
agisboye:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| [submodule "Vendor/sqlcipher"] | ||
| path = Vendor/sqlcipher | ||
| url = https://github.com/sqlcipher/sqlcipher.git | ||
| [submodule "Vendor/SQLite.swift"] | ||
| path = Vendor/SQLite.swift | ||
| url = https://github.com/stephencelis/SQLite.swift.git | ||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher iOS.xcscheme
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "0720" | ||
| version = "1.3"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "80EC44981C4314EE00BADFB1" | ||
| BuildableName = "SQLiteCipher iOS.framework" | ||
| BlueprintName = "SQLiteCipher iOS" | ||
| ReferencedContainer = "container:SQLiteCipher.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "NO" | ||
| buildForProfiling = "NO" | ||
| buildForArchiving = "NO" | ||
| buildForAnalyzing = "NO"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "80EC44A21C4314EE00BADFB1" | ||
| BuildableName = "SQLiteCipherTests.xctest" | ||
| BlueprintName = "SQLiteCipherTests" | ||
| ReferencedContainer = "container:SQLiteCipher.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "NO" | ||
| buildForProfiling = "NO" | ||
| buildForArchiving = "NO" | ||
| buildForAnalyzing = "NO"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "EE247ADC1C3F04ED00AE3E12" | ||
| BuildableName = "SQLiteTests iOS.xctest" | ||
| BlueprintName = "SQLiteTests iOS" | ||
| ReferencedContainer = "container:Vendor/SQLite.swift/SQLite.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| codeCoverageEnabled = "YES"> | ||
| <Testables> | ||
| </Testables> | ||
| <MacroExpansion> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "80EC44981C4314EE00BADFB1" | ||
| BuildableName = "SQLiteCipher iOS.framework" | ||
| BlueprintName = "SQLiteCipher iOS" | ||
| ReferencedContainer = "container:SQLiteCipher.xcodeproj"> | ||
| </BuildableReference> | ||
| </MacroExpansion> | ||
| <AdditionalOptions> | ||
| </AdditionalOptions> | ||
| </TestAction> | ||
| <LaunchAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| launchStyle = "0" | ||
| useCustomWorkingDirectory = "NO" | ||
| ignoresPersistentStateOnLaunch = "NO" | ||
| debugDocumentVersioning = "YES" | ||
| debugServiceExtension = "internal" | ||
| allowLocationSimulation = "YES"> | ||
| <MacroExpansion> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "80EC44981C4314EE00BADFB1" | ||
| BuildableName = "SQLiteCipher iOS.framework" | ||
| BlueprintName = "SQLiteCipher iOS" | ||
| ReferencedContainer = "container:SQLiteCipher.xcodeproj"> | ||
| </BuildableReference> | ||
| </MacroExpansion> | ||
| <AdditionalOptions> | ||
| </AdditionalOptions> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| buildConfiguration = "Release" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| debugDocumentVersioning = "YES"> | ||
| <MacroExpansion> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "80EC44981C4314EE00BADFB1" | ||
| BuildableName = "SQLiteCipher iOS.framework" | ||
| BlueprintName = "SQLiteCipher iOS" | ||
| ReferencedContainer = "container:SQLiteCipher.xcodeproj"> | ||
| </BuildableReference> | ||
| </MacroExpansion> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ | |
| // THE SOFTWARE. | ||
| // | ||
|
|
||
| import SQLite3 | ||
| //import SQLite3 | ||
|
|
||
| extension Connection { | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| #import "SQLite.h" | ||
| #import "SQLite.h" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| import XCTest | ||
| import SQLiteCipher | ||
| import SQLite3 | ||
|
|
||
| class CipherTests: XCTestCase { | ||
|
|
||
|
|
||
Submodule SQLite.swift
updated
38 files
Submodule sqlcipher
deleted from
c01b94
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| *.lo | ||
| *.o | ||
| *.mode1v3 | ||
| *.pbxuser | ||
| xcuserdata | ||
| xcuserdata/* | ||
| *.xcworkspace/* | ||
| *.xcworkspace | ||
| /Makefile | ||
| /.libs | ||
| /.target_source | ||
| /config.h | ||
| /config.log | ||
| /config.status | ||
| /keywordhash.h | ||
| /mkkeywordhash* | ||
| /opcodes.c | ||
| /opcodes.h | ||
| /parse.c | ||
| /parse.h | ||
| /parse.h.temp | ||
| /parse.out | ||
| /tsrc | ||
| /testfixture* | ||
| /lemon* | ||
| /libtool | ||
| /libsqlite3.la | ||
| /libtclsqlite3.la | ||
| /sqlite3 | ||
| /sqlite3.c | ||
| /sqlite3.h | ||
| /lempar.c | ||
| /parse.y | ||
| /shell.c | ||
| /sqlcipher | ||
| /sqlite3.pc | ||
| /sqlcipher.pc | ||
| /sqlite3ext.h | ||
| /libsqlcipher.la | ||
| /.DS_Store |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| # SQLCipher Change Log | ||
| All notable changes to this project will be documented in this file. | ||
|
|
||
| ## [Unreleased][unreleased] | ||
|
|
||
| ## [3.3.1] - 2015-07-13 | ||
| ### Changed | ||
| - Merge upstream SQLite 3.8.10.2 | ||
| - Fixed segfault when provided an invalid cipher name | ||
| - Check for codec context when performing `PRAGMA cipher_store_pass` | ||
| - Remove extraneous null check in `PRAGMA cipher_migrate` | ||
|
|
||
| ## [3.3.0] - 2015-03-25 | ||
| ### Added | ||
| - Added FIPS API calls within the OpenSSL crypto provider | ||
| - `PRAGMA cipher_default_page_size` - support for attaching non-default page sizes | ||
|
|
||
| ### Changed | ||
| - Merged upstream SQLite 3.8.8.3 | ||
|
|
||
| ## [3.2.0] - 2014-09-30 | ||
| ### Added | ||
| - Added PRAGMA cipher_store_pass | ||
|
|
||
| ### Changed | ||
| - Merged upstream SQLite 3.8.6 | ||
| - Renmed README to README.md | ||
|
|
||
| ## [3.1.0] - 2014-04-23 | ||
| ### Added | ||
| - Added `PRAGMA cipher_profile` | ||
|
|
||
| ### Changed | ||
| - Merged upstream SQLite 3.8.4.3 | ||
|
|
||
| ## [3.0.1] - 2013-12-06 | ||
| ### Added | ||
| - Add `PRAGMA cipher_add_random` to source external entropy | ||
|
|
||
| ### Changed | ||
| - Fix `PRAGMA cipher_migrate` to handle passphrases longer than 64 characters & raw keys | ||
| - Improvements to the libtomcrypt provider | ||
|
|
||
| ## [3.0.0] - 2013-11-05 | ||
| ### Added | ||
| - Added `PRAGMA cipher_migrate` to migrate older database file formats | ||
|
|
||
| ### Changed | ||
| - Merged upstream SQLite 3.8.0.2 | ||
| - Remove usage of VirtualLock/Unlock on WinRT and Windows Phone | ||
| - Ignore HMAC read during Btree file copy | ||
| - Fix lib naming for pkg-config | ||
| - Use _v2 version of sqlite3_key and sqlite3_rekey | ||
| - Update xcodeproj file | ||
|
|
||
| ### Security | ||
| - Change KDF iteration length from 4,000 to 64,000 | ||
|
|
||
| [unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.1...prerelease | ||
| [3.3.1]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.0...v3.3.1 | ||
| [3.3.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.2.0...v3.3.0 | ||
| [3.2.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.1.0...v3.2.0 | ||
| [3.1.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.0.1...v3.1.0 | ||
| [3.0.1]: https://github.com/sqlcipher/sqlcipher/compare/v3.0.0...v3.0.1 | ||
| [3.0.0]: https://github.com/sqlcipher/sqlcipher/compare/v2.2.0...v3.0.0 | ||
| [2.2.0]: https://github.com/sqlcipher/sqlcipher/compare/v2.1.1...v2.2.0 | ||
| [2.1.1]: https://github.com/sqlcipher/sqlcipher/compare/v2.1.0...v2.1.1 | ||
| [2.1.0]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.6...v2.1.0 | ||
| [2.0.6]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.5...v2.0.6 | ||
| [2.0.5]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.3...v2.0.5 | ||
| [2.0.3]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.0...v2.0.3 | ||
| [2.0.0]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.10...v2.0.0 | ||
| [1.1.10]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.9...v1.1.10 | ||
| [1.1.9]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.8...v1.1.9 | ||
| [1.1.8]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.7...v1.1.8 | ||
| [1.1.7]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.6...v1.1.7 | ||
| [1.1.6]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.5...v1.1.6 | ||
| [1.1.5]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.4...v1.1.5 | ||
| [1.1.4]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.3...v1.1.4 | ||
| [1.1.3]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.2...v1.1.3 | ||
| [1.1.2]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.1...v1.1.1 | ||
| [1.1.1]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.0...v1.1.1 | ||
| [1.1.0]: https://github.com/sqlcipher/sqlcipher/compare/617ed01...v1.1.0 | ||
|
|
||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| Copyright (c) 2008, ZETETIC LLC | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| * Neither the name of the ZETETIC LLC nor the | ||
| names of its contributors may be used to endorse or promote products | ||
| derived from this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY ZETETIC LLC ''AS IS'' AND ANY | ||
| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL ZETETIC LLC BE LIABLE FOR ANY | ||
| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can I ask why this was removed as a submodule? (just want to learn...)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Carthage wasn't building the amalgamation target properly, if I recall correctly. The easiest solution was to remove sqlcipher as a submodule and manually add some files that Xcode complained were missing. Now with Xcode 7.3, though, it doesn't build at all. I haven't been able to get it working.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've experienced the same thing, regardless of whether or not I use your way in this PR or use sqlcipher as a submodule. Still working on it. Thanks for the response.