Use an embedded module instead of a bridging header

I'd taken advantage of the fact that renaming the umbrella header
disabled the framework bridging header check, which is a bug and could
stop working at any moment.

Instead, let's embed a `sqlite3` framework module that points to the
appropriate system header.

As soon as the system provides an appropriate `sqlite3` module at the
system level, we merely have to delete this internal dependency.

Signed-off-by: Stephen Celis <[email protected]>

Author: stephencelis

Documentation/Index.md

@@ -102,9 +102,12 @@ It’s possible to use SQLite.swift in a target that doesn’t support framework
 
  2. Copy the SQLite.swift source files (from its **SQLite** directory) into your Xcode project.
 
- 3. Add the following line to your project’s [bridging header](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/MixandMatch.html#//apple_ref/doc/uid/TP40014216-CH10-XID_79) (a file usually in the form of `$(TARGET_NAME)-Bridging-Header.h`.
+ 3. Remove `import sqlite3` (and `@import sqlite3;`) from the SQLite.swift source files that call it.
+
+ 4. Add the following lines to your project’s [bridging header](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/MixandMatch.html#//apple_ref/doc/uid/TP40014216-CH10-XID_79) (a file usually in the form of `$(TARGET_NAME)-Bridging-Header.h`.
 
     ``` swift
+    #import <sqlite3.h>
     #import "SQLite-Bridging.h"
     ```
 

SQLite.xcodeproj/project.pbxproj

@@ -22,7 +22,7 @@
 // THE SOFTWARE.
 //
 
-import Foundation
+import sqlite3
 
 /// A connection (handle) to a SQLite database.
 public final class Database {

SQLite/Database.swift

@@ -22,12 +22,9 @@
 // THE SOFTWARE.
 //
 
+@import sqlite3;
 @import Foundation;
 
-#include <sqlite3.h>
-
-#include "fts3_tokenizer.h"
-
 typedef int (^SQLiteBusyHandlerCallback)(int times);
 int SQLiteBusyHandler(sqlite3 * handle, SQLiteBusyHandlerCallback callback);
 

SQLite/SQLite-Bridging-Header.h

@@ -22,9 +22,9 @@
 // THE SOFTWARE.
 //
 
-#include "SQLite-Bridging.h"
+#import "SQLite-Bridging.h"
 
-@import Foundation;
+#import "fts3_tokenizer.h"
 
 static int _SQLiteBusyHandler(void * context, int tries) {
     return ((__bridge SQLiteBusyHandlerCallback)context)(tries);

SQLite/SQLite-Bridging.h

@@ -5,3 +5,5 @@ FOUNDATION_EXPORT double SQLite_VersionNumber;
 
 //! Project version string for SQLite.
 FOUNDATION_EXPORT const unsigned char SQLite_VersionString[];
+
+#import <SQLite/SQLite-Bridging.h>

SQLite/SQLite-Bridging.m

@@ -22,6 +22,8 @@
 // THE SOFTWARE.
 //
 
+import sqlite3
+
 internal let SQLITE_STATIC = sqlite3_destructor_type(COpaquePointer(bitPattern: 0))
 internal let SQLITE_TRANSIENT = sqlite3_destructor_type(COpaquePointer(bitPattern: -1))
 

SQLite/SQLite.swift.h renamed to SQLite/SQLite.h

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.stephencelis.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

SQLite/Statement.swift

@@ -0,0 +1,4 @@
+module sqlite3 [system] {
+    header "/Applications/Xcode-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
+    export *
+}