Merge branch 'master' into huan_primary_key_with_4_columns

Author: hellohuanlin

.travis.yml

@@ -1,11 +1,11 @@
 language: objective-c
 rvm: 2.3
 # https://docs.travis-ci.com/user/reference/osx
-osx_image: xcode10.1
+osx_image: xcode10.2
 env:
   global:
-    - IOS_SIMULATOR="iPhone 6s"
-    - IOS_VERSION="12.1"
+    - IOS_SIMULATOR="iPhone XS"
+    - IOS_VERSION="12.2"
 matrix:
   include:
     - env: BUILD_SCHEME="SQLite iOS"
@@ -25,4 +25,7 @@ before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
 script:
+# Workaround for Xcode 10.2/tvOS 9.1 bug
+# See https://stackoverflow.com/questions/55389080/xcode-10-2-failed-to-run-app-on-simulator-with-ios-10
+  - sudo mkdir /Library/Developer/CoreSimulator/Profiles/Runtimes/tvOS\ 9.1.simruntime/Contents/Resources/RuntimeRoot/usr/lib/swift
   - ./run-tests.sh

CONTRIBUTING.md

@@ -74,7 +74,7 @@ Made it through everything above and still having trouble? Sorry!
   - Even better: link to a sample project exhibiting the issue.
   - Include the SQLite.swift commit or branch experiencing the issue.
   - Include devices and operating systems affected.
-  - Include build information: the Xcode and OS X versions affected.
+  - Include build information: the Xcode and macOS versions affected.
 
 [installation instructions]: Documentation/Index.md#installation
 [See Documentation]: Documentation/Index.md#sqliteswift-documentation

Documentation/Index.md

@@ -67,8 +67,8 @@
 
 ## Installation
 
-> _Note:_ SQLite.swift requires Swift 4.1 (and
-> [Xcode 9.3](https://developer.apple.com/xcode/downloads/)) or greater.
+> _Note:_ SQLite.swift requires Swift 5 (and
+> [Xcode 10.2](https://developer.apple.com/xcode/downloads/)) or greater.
 
 
 ### Carthage
@@ -80,7 +80,7 @@ install SQLite.swift with Carthage:
  2. Update your Cartfile to include the following:
 
     ```ruby
-    github "stephencelis/SQLite.swift" ~> 0.11.5
+    github "stephencelis/SQLite.swift" ~> 0.12.0
     ```
 
  3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -96,7 +96,7 @@ 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 1.0.0 or greater).
+    requires version 1.6.1 or greater).
 
     ```sh
     # Using the default Ruby install will require you to use sudo when
@@ -110,7 +110,7 @@ install SQLite.swift with Carthage:
     use_frameworks!
 
     target 'YourAppTargetName' do
-        pod 'SQLite.swift', '~> 0.11.5'
+        pod 'SQLite.swift', '~> 0.12.0'
     end
     ```
 
@@ -124,7 +124,7 @@ with the OS you can require the `standalone` subspec:
 
 ```ruby
 target 'YourAppTargetName' do
-  pod 'SQLite.swift/standalone', '~> 0.11.5'
+  pod 'SQLite.swift/standalone', '~> 0.12.0'
 end
 ```
 
@@ -134,7 +134,7 @@ dependency to sqlite3 or one of its subspecs:
 
 ```ruby
 target 'YourAppTargetName' do
-  pod 'SQLite.swift/standalone', '~> 0.11.5'
+  pod 'SQLite.swift/standalone', '~> 0.12.0'
   pod 'sqlite3/fts5', '= 3.15.0'  # SQLite 3.15.0 with FTS5 enabled
 end
 ```
@@ -148,7 +148,7 @@ If you want to use [SQLCipher][] with SQLite.swift you can require the
 
 ```ruby
 target 'YourAppTargetName' do
-  pod 'SQLite.swift/SQLCipher', '~> 0.11.5'
+  pod 'SQLite.swift/SQLCipher', '~> 0.12.0'
 end
 ```
 
@@ -181,7 +181,7 @@ applications.
 
   ```swift
   dependencies: [
-    .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.5")
+    .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12.0")
   ]
   ```
 
@@ -258,7 +258,7 @@ let path = NSSearchPathForDirectoriesInDomains(
 let db = try Connection("\(path)/db.sqlite3")
 ```
 
-On OS X, you can use your app’s **Application Support** directory:
+On macOS, you can use your app’s **Application Support** directory:
 
 ```swift
 var path = NSSearchPathForDirectoriesInDomains(

Documentation/Planning.md

@@ -6,7 +6,7 @@ additions and Pull Requests, as well as to keep the Issues list clear of
 enhancement requests so that bugs are more visible.
 
 > ⚠ This document is currently not actively maintained. See
-> the [0.12.0 milestone](https://github.com/stephencelis/SQLite.swift/issues?q=is%3Aopen+is%3Aissue+milestone%3A0.12.0)
+> the [0.13.0 milestone](https://github.com/stephencelis/SQLite.swift/issues?q=is%3Aopen+is%3Aissue+milestone%3A0.13.0)
 > on Github for additional information about planned features for the next release.
 
 ## Roadmap

Makefile

@@ -1,7 +1,7 @@
 BUILD_TOOL = xcodebuild
 BUILD_SCHEME = SQLite Mac
-IOS_SIMULATOR = iPhone 6s
-IOS_VERSION = 12.1
+IOS_SIMULATOR = iPhone XS
+IOS_VERSION = 12.2
 ifeq ($(BUILD_SCHEME),SQLite iOS)
 	BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
 else

Package.swift

@@ -9,7 +9,7 @@ let package = Package(
         .target(name: "SQLiteObjc"),
         .testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests")
     ],
-    swiftLanguageVersions: [4]
+    swiftLanguageVersions: [4, 5]
 )
 
 #if os(Linux)

README.md

@@ -1,6 +1,6 @@
 # SQLite.swift
 
-[![Build Status][TravisBadge]][TravisLink] [![CocoaPods Version][CocoaPodsVersionBadge]][CocoaPodsVersionLink] [![Swift4 compatible][Swift4Badge]][Swift4Link] [![Platform][PlatformBadge]][PlatformLink] [![Carthage compatible][CartagheBadge]][CarthageLink] [![Join the chat at https://gitter.im/stephencelis/SQLite.swift][GitterBadge]][GitterLink]
+[![Build Status][TravisBadge]][TravisLink] [![CocoaPods Version][CocoaPodsVersionBadge]][CocoaPodsVersionLink] [![Swift5 compatible][Swift5Badge]][Swift5Link] [![Platform][PlatformBadge]][PlatformLink] [![Carthage compatible][CartagheBadge]][CarthageLink] [![Join the chat at https://gitter.im/stephencelis/SQLite.swift][GitterBadge]][GitterLink]
 
 A type-safe, [Swift][]-language layer over [SQLite3][].
 
@@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2].
 
 ## Installation
 
-> _Note:_ SQLite.swift requires Swift 4.1 (and [Xcode][] 9.3).
+> _Note:_ Version 0.12 requires Swift 5 (and [Xcode](https://developer.apple.com/xcode/downloads/) 10.2) or greater. Version 0.11.6 requires Swift 4.2 (and [Xcode](https://developer.apple.com/xcode/downloads/) 10.1) or greater.
 
 ### Carthage
 
@@ -124,7 +124,7 @@ install SQLite.swift with Carthage:
  2. Update your Cartfile to include the following:
 
     ```ruby
-    github "stephencelis/SQLite.swift" ~> 0.11.5
+    github "stephencelis/SQLite.swift" ~> 0.12.0
     ```
 
  3. Run `carthage update` and
@@ -142,7 +142,7 @@ install SQLite.swift with Carthage:
 SQLite.swift with CocoaPods:
 
  1. Make sure CocoaPods is [installed][CocoaPods Installation]. (SQLite.swift
-    requires version 1.0.0 or greater.)
+    requires version 1.6.1 or greater.)
 
     ```sh
     # Using the default Ruby install will require you to use sudo when
@@ -156,7 +156,7 @@ SQLite.swift with CocoaPods:
     use_frameworks!
 
     target 'YourAppTargetName' do
-        pod 'SQLite.swift', '~> 0.11.5'
+        pod 'SQLite.swift', '~> 0.12.0'
     end
     ```
 
@@ -174,7 +174,7 @@ Swift code.
 
   ```swift
   dependencies: [
-      .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.5")
+      .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12.0")
   ]
   ```
 
@@ -285,8 +285,8 @@ Looking for something else? Try another Swift wrapper (or [FMDB][]):
 [GitterBadge]: https://badges.gitter.im/stephencelis/SQLite.swift.svg
 [GitterLink]: https://gitter.im/stephencelis/SQLite.swift
 
-[Swift4Badge]: https://img.shields.io/badge/swift-4.1-orange.svg?style=flat
-[Swift4Link]: https://developer.apple.com/swift/
+[Swift5Badge]: https://img.shields.io/badge/swift-5-orange.svg?style=flat
+[Swift5Link]: https://developer.apple.com/swift/
 
 [SQLiteMigrationManager.swift]: https://github.com/garriguv/SQLiteMigrationManager.swift
 [FMDB]: https://github.com/ccgus/fmdb

SQLite.swift.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "SQLite.swift"
-  s.version          = "0.11.5"
-  s.summary          = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
+  s.version          = "0.12.0"
+  s.summary          = "A type-safe, Swift-language layer over SQLite3 for iOS and macOS."
 
   s.description      = <<-DESC
     SQLite.swift provides compile-time confidence in SQL statement syntax and
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = "2.2"
   s.default_subspec  = 'standard'
   s.pod_target_xcconfig = {
-    'SWIFT_VERSION' => '4.2',
+    'SWIFT_VERSION' => '5',
   }
 
   s.subspec 'standard' do |ss|