Merge

Author: sauliusgrigaitis

.travis.yml

@@ -6,4 +6,4 @@ before_install:
   - gem install xcpretty --no-document
 script:
   - make test
-osx_image: xcode7
+osx_image: xcode7.3

CocoaPods/appletvos/module.modulemap

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

CocoaPods/appletvsimulator/module.modulemap

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

CocoaPods/iphoneos/module.modulemap

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

CocoaPods/iphonesimulator/module.modulemap

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

CocoaPods/macosx/module.modulemap

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

CocoaPods/watchos/module.modulemap

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

CocoaPods/watchsimulator/module.modulemap

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

Documentation/Index.md

@@ -78,7 +78,7 @@ install SQLite.swift with Carthage:
  2. Update your Cartfile to include the following:
 
     ```
-    github "stephencelis/SQLite.swift" ~> 0.9.2
+    github "stephencelis/SQLite.swift" ~> 0.10.0
     ```
 
  3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -93,14 +93,20 @@ install SQLite.swift with Carthage:
 
 [CocoaPods][] is a dependency manager for Cocoa projects. To install SQLite.swift with CocoaPods:
 
- 1. Make sure CocoaPods is [installed][CocoaPods Installation] (SQLite.swift requires version 0.37 or greater).
+ 1. Make sure the latest CocoaPods beta is [installed][CocoaPods Installation]. (SQLite.swift requires version 1.0.0.beta.6 or greater.)
+
+    ``` sh
+    # Using the default Ruby install will require you to use sudo when
+    # installing and updating gems.
+    sudo gem install --pre cocoapods
+    ```
 
  2. Update your Podfile to include the following:
 
     ``` ruby
     use_frameworks!
 
-    pod 'SQLite.swift', '~> 0.9.2'
+    pod 'SQLite.swift', '~> 0.10.0'
     ```
 
  3. Run `pod install`.

Package.swift

@@ -1,7 +1,7 @@
 import PackageDescription
 
 let package = Package(
-  exclude: ["Documentation", "podstuff", "SQLiteTests"],
+  exclude: ["CocoaPods", "Documentation", "podstuff", "SQLiteTests"],
 //  targets: [
 //      Target(name: "Tests", dependencies: [.Target(name: "SQLite")])],
   dependencies: [