Fix items found in first code review comments

 - remove @testable
 - remove SQLCipher references in docs
 - add deployment target to pod spec
 - merge recent master changes

Author: mikemee

Documentation/Index.md

@@ -4,7 +4,6 @@
     - [Carthage](#carthage)
     - [CocoaPods](#cocoapods)
     - [Manual](#manual)
-    - [SQLCipher](#sqlcipher)
     - [Frameworkless Targets](#frameworkless-targets)
   - [Getting Started](#getting-started)
     - [Connecting to a Database](#connecting-to-a-database)
@@ -103,10 +102,6 @@ install SQLite.swift with Carthage:
 
     pod 'SQLite.swift',
       git: 'https://github.com/stephencelis/SQLite.swift.git'
-
-    # instead, for SQLCipher support
-    pod 'SQLiteCipher.swift',
-      git: 'https://github.com/stephencelis/SQLite.swift.git'
     ```
 
  3. Run `pod install`.
@@ -132,22 +127,6 @@ To install SQLite.swift as an Xcode sub-project:
 You should now be able to `import SQLite` from any of your target’s source files and begin using SQLite.swift.
 
 
-#### SQLCipher
-
-> _Note_: To install with CocoaPods, [see above](#cocoapods).
-
-To install SQLite.swift with [SQLCipher](http://sqlcipher.net) support:
-
- 1. Make sure the **sqlcipher** working copy is checked out in Xcode. If **sqlcipher.xcodeproj** is unavailable (_i.e._, it appears red), go to the **Source Control** menu and select **Check Out sqlcipher…** from the **sqlcipher** menu item.
-
- 2. Follow [the instructions above](#manual) with the **SQLiteCipher** target, instead.
-
-> _Note:_ By default, SQLCipher compiles [without support for full-text search](https://github.com/sqlcipher/sqlcipher/issues/102). If you intend to use [FTS4](#full-text-search), make sure you add the following to **Other C Flags** in the **Build Settings** of the **sqlcipher** target (in the **sqlcipher.xcodeproj** project):
->
->  - `-DSQLITE_ENABLE_FTS4`
->  - `-DSQLITE_ENABLE_FTS3_PARENTHESIS`
-
-
 ### Frameworkless Targets
 
 It’s possible to use SQLite.swift in a target that doesn’t support frameworks, including iOS 7 apps and OS X command line tools, though it takes a little extra work.

README.md

@@ -21,9 +21,9 @@ syntax _and_ intent.
  - A lightweight, uncomplicated query and parameter binding interface
  - Developer-friendly error handling and debugging
  - [Full-text search][] support
- - [SQLCipher](#sqlcipher) support
  - [Well-documented][See Documentation]
  - Extensively tested
+ - SQLCipher support will be available again soon (see #311)
 
 [Full-text search]: Documentation/Index.md#full-text-search
 [See Documentation]: Documentation/Index.md#sqliteswift-documentation
@@ -150,10 +150,6 @@ SQLite.swift with CocoaPods:
 
     pod 'SQLite.swift',
       git: 'https://github.com/stephencelis/SQLite.swift.git'
-
-    # instead, for SQLCipher support
-    pod 'SQLiteCipher.swift',
-      git: 'https://github.com/stephencelis/SQLite.swift.git'
     ```
 
  3. Run `pod install`.
@@ -184,33 +180,6 @@ To install SQLite.swift as an Xcode sub-project:
 [download]: https://github.com/stephencelis/SQLite.swift/archive/master.zip
 
 
-#### SQLCipher
-
-> _Note_: To install with CocoaPods, [see above](#cocoapods).
-
-To install SQLite.swift with [SQLCipher][] support:
-
- 1. Make sure the **sqlcipher** working copy is checked out in Xcode. If
-    **sqlcipher.xcodeproj** is unavailable (_i.e._, it appears red), go to the
-    **Source Control** menu and select **Check Out sqlcipher…** from the
-    **sqlcipher** menu item.
-
- 2. Follow [the instructions above](#manual) with the **SQLiteCipher** target,
-    instead.
-
-> _Note:_ By default, SQLCipher compiles [without support for full-text
-> search][]. If you intend to use [FTS4][], make sure you add the
-> following to **Other C Flags** in the **Build Settings** of the
-> **sqlcipher** target (in the **sqlcipher.xcodeproj** project):
->
->  - `-DSQLITE_ENABLE_FTS4`
->  - `-DSQLITE_ENABLE_FTS3_PARENTHESIS`
-
-[SQLCipher]: http://sqlcipher.net
-[without support for full-text search]: https://github.com/sqlcipher/sqlcipher/issues/102
-[FTS4]: http://www.sqlite.org/fts3.html
-
-
 ## Communication
 
 [Read the contributing guidelines][]. The _TL;DR_ (but please; _R_):

SQLite.swift.podspec

@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
 
   s.module_name      = 'SQLite'
   s.module_map       = 'module.modulemap'
+  s.ios.deployment_target = "8.0"
 
   s.source_files = 'SQLite/**/*'
 

SQLiteTests/AggregateFunctionsTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class AggregateFunctionsTests : XCTestCase {
 

SQLiteTests/BlobTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class BlobTests : XCTestCase {
 

SQLiteTests/ConnectionTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class ConnectionTests : SQLiteTestCase {
 

SQLiteTests/CoreFunctionsTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class CoreFunctionsTests : XCTestCase {
 

SQLiteTests/CustomFunctionsTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class CustomFunctionsTests : XCTestCase {
 

SQLiteTests/ExpressionTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class ExpressionTests : XCTestCase {
 

SQLiteTests/FTS4Tests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import SQLite
+import SQLite
 
 class FTS4Tests : XCTestCase {