Prep for public release to CocoaPods

 * Remove `SQLiteCipher` (for now)
 * rebuild clean from "New Project" with Xcode 7.2
 * fix build glitches with Carthage
 * fix build glitches with CocoaPods
 * separate build targets from test targets with @testable import
 * make sqlite3 a Swift system module so `import SQLite3` works in `.swift` files (for this framework)
 * use an Xcode project file instead of Workspace
 * folder structure rearranged
 * CocoaPod hassles: doesn't generate its own module.modulemap file, has spurious warning about missing include

Author: mikemee

.gitignore

@@ -1,10 +1,23 @@
+# OS X
+.DS_Store
+
 # Xcode
 build/
-timeline.xctimeline
-xcuserdata/
-
-# System
-.DS_Store
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
 
 # Carthage
-Carthage/
+Carthage

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "sqlcipher"]
-	path = Vendor/sqlcipher
-	url = https://github.com/sqlcipher/sqlcipher.git

Makefile

@@ -48,6 +48,6 @@ repl:
 		swift -F '$(TMPDIR)/SQLite.swift/Build/Products/Debug'
 
 sloc:
-	@zsh -c "grep -vE '^ *//|^$$' SQLite/*.{swift,h,c} | wc -l"
+	@zsh -c "grep -vE '^ *//|^$$' SQLite/*/*.{swift,h,m} | wc -l"
 
 .PHONY: test coverage clean repl sloc

SQLite.swift.podspec

@@ -1,17 +1,32 @@
-$LOAD_PATH << '.'
-require 'Supporting Files/podspec.rb'
+#
+# `pod lib lint SQLite.swift.podspec' fails - see
+#    https://github.com/CocoaPods/CocoaPods/issues/4607
+#
 
-Pod::Spec.new do |spec|
-  spec.name = 'SQLite.swift'
-  spec.summary = 'A type-safe, Swift-language layer over SQLite3.'
+Pod::Spec.new do |s|
+  s.name             = "SQLite.swift"
+  s.version          = "0.9.0"
+  s.summary          = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
 
-  spec.description = <<-DESC
+  s.description      = <<-DESC
     SQLite.swift provides compile-time confidence in SQL statement syntax and
     intent.
-  DESC
+                       DESC
 
-  apply_shared_config spec, 'SQLite'
+  s.homepage         = "https://github.com/stephencelis/SQLite.swift"
+  s.license          = 'MIT'
+  s.author           = { "Stephen Celis" => "[email protected]" }
+  s.source           = { :git => "https://github.com/stephencelis/SQLite.swift.git", :tag => s.version.to_s }
+  s.social_media_url = 'https://twitter.com/stephencelis'
+
+  s.module_name      = 'SQLite'
+  s.module_map       = 'module.modulemap'
+
+  s.source_files = 'SQLite/**/*'
+
+  # make the sqlite3 C library behave like a module
+  s.libraries        = 'sqlite3'
+  s.xcconfig         = { 'SWIFT_INCLUDE_PATHS' => '${PODS_ROOT}/SQLite.swift/SQLite3' }
+  s.preserve_path    = 'SQLite3/*'
 
-  spec.exclude_files = 'Source/Cipher/Cipher.swift'
-  spec.library = 'sqlite3'
 end

SQLite.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DC7253AB1B52ADEB009B38B1"
+               BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12"
                BuildableName = "SQLite.framework"
                BlueprintName = "SQLite Mac"
                ReferencedContainer = "container:SQLite.xcodeproj">
@@ -33,17 +33,17 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DC7253B41B52ADEC009B38B1"
-               BuildableName = "SQLite Mac Tests.xctest"
-               BlueprintName = "SQLite Mac Tests"
+               BlueprintIdentifier = "EE247B441C3F3ED000AE3E12"
+               BuildableName = "SQLiteTests Mac.xctest"
+               BlueprintName = "SQLiteTests Mac"
                ReferencedContainer = "container:SQLite.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC7253AB1B52ADEB009B38B1"
+            BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12"
             BuildableName = "SQLite.framework"
             BlueprintName = "SQLite Mac"
             ReferencedContainer = "container:SQLite.xcodeproj">
@@ -65,7 +65,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC7253AB1B52ADEB009B38B1"
+            BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12"
             BuildableName = "SQLite.framework"
             BlueprintName = "SQLite Mac"
             ReferencedContainer = "container:SQLite.xcodeproj">
@@ -83,7 +83,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC7253AB1B52ADEB009B38B1"
+            BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12"
             BuildableName = "SQLite.framework"
             BlueprintName = "SQLite Mac"
             ReferencedContainer = "container:SQLite.xcodeproj">

SQLite.xcodeproj/project.xcworkspace/xcshareddata/SQLite.xcscmblueprint

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DC2B29E11B26F718001C60EA"
+               BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12"
                BuildableName = "SQLite.framework"
                BlueprintName = "SQLite iOS"
                ReferencedContainer = "container:SQLite.xcodeproj">
@@ -23,27 +23,27 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES"
-      buildConfiguration = "Debug">
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DC2B29EB1B26F718001C60EA"
-               BuildableName = "SQLite iOS Tests.xctest"
-               BlueprintName = "SQLite iOS Tests"
+               BlueprintIdentifier = "EE247ADC1C3F04ED00AE3E12"
+               BuildableName = "SQLiteTests iOS.xctest"
+               BlueprintName = "SQLiteTests iOS"
                ReferencedContainer = "container:SQLite.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC2B29E11B26F718001C60EA"
+            BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12"
             BuildableName = "SQLite.framework"
             BlueprintName = "SQLite iOS"
             ReferencedContainer = "container:SQLite.xcodeproj">
@@ -53,19 +53,19 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC2B29E11B26F718001C60EA"
+            BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12"
             BuildableName = "SQLite.framework"
             BlueprintName = "SQLite iOS"
             ReferencedContainer = "container:SQLite.xcodeproj">
@@ -75,15 +75,15 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DC2B29E11B26F718001C60EA"
+            BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12"
             BuildableName = "SQLite.framework"
             BlueprintName = "SQLite iOS"
             ReferencedContainer = "container:SQLite.xcodeproj">