Merge branch 'master' of github.com:danthorpe/YapDatabaseExtensions i…

…nto development

# Conflicts:
#	.ci/buildkite/pipeline.template.yml
#	.fastlane/Fastfile
#	Cartfile
#	Cartfile.resolved
#	Gemfile.lock
#	Supporting Files/Carthage.xcconfig
#	Supporting Files/Version.xcconfig
#	Supporting Files/YapDatabaseExtensions.h
#	Supporting Files/YapDatabaseExtensions.xcconfig
#	YapDatabaseExtensions.xcodeproj/project.pbxproj
#	YapDatabaseExtensions.xcodeproj/xcshareddata/xcschemes/YapDatabaseExtensions.xcscheme

.ci/buildkite/pipeline.template.yml

@@ -9,4 +9,4 @@ steps:
     command: .ci/scripts/test-ios
     agents:
       xcode: "$XCODE"
-      iOS-Simulator: true
+      queue: "iOS-Simulator"

.fastlane/Fastfile

@@ -10,7 +10,7 @@ platform :ios do
     scan(
       scheme: 'YapDatabaseExtensions', 
       output_directory: ".ci/xcodebuild-data",
-      destination: "platform=iOS Simulator,OS=9.3,name=iPhone 6s"
+      destination: "platform=iOS Simulator,OS=10.1,name=iPhone 7"
     )
 
   end

.swift-version

@@ -0,0 +1 @@
+2.3

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.6.0
+Updated for Swift 2.3 - sorry it's taken so long!
+
 # 2.5.0
 1. [[YDB-84](https://github.com/danthorpe/YapDatabaseExtensions/pull/85)]: Updates to Swift 2.2
 

Cartfile

@@ -1,3 +1,3 @@
-github "danthorpe/ValueCoding" "1.4.0"
-github "CocoaLumberjack/CocoaLumberjack" "2.3.0"
+github "danthorpe/ValueCoding" "1.5.0"
+github "CocoaLumberjack/CocoaLumberjack" "2.4.0"
 github "yapstudios/YapDatabase" "2.9.2"

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "CocoaLumberjack/CocoaLumberjack" "2.3.0"
+github "CocoaLumberjack/CocoaLumberjack" "2.4.0"
 github "tonymillion/Reachability" "c4d225a479379f9998dbd5b55070427373d20574"
-github "danthorpe/ValueCoding" "1.4.0"
+github "danthorpe/ValueCoding" "1.5.0"
 github "yapstudios/YapDatabase" "2.9.2"