Merge pull request tristanhimmelman#158 from ldiqual/swift-2.0

tristanhimmelman · tristanhimmelman · commit 679eadabf010 · 2015-07-24T17:54:37.000-04:00
Updated for xcode 7 beta 4
diff --git a/Cartfile.private b/Cartfile.private
@@ -1 +1 @@
-github "Quick/Nimble" ~> 2.0.0
+github "Quick/Nimble" "swift-2.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "Quick/Nimble" "v2.0.0-rc.1"
+github "Quick/Nimble" "a804949542eb2f299b823ffb36936aec54fe0db6"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit fa73feeb156d8af7f47ae94dde07f1f7847bb1a3
+Subproject commit a804949542eb2f299b823ffb36936aec54fe0db6
diff --git a/ObjectMapper/Core/ToJSON.swift b/ObjectMapper/Core/ToJSON.swift
@@ -13,7 +13,7 @@ private func setValue(value: AnyObject, forKey key: String, inout dictionary: [S
 	return setValue(value, forKeyPathComponents: keyComponents, dictionary: &dictionary)
 }
 
-private func setValue(value: AnyObject, forKeyPathComponents components: ArraySlice<String.CharacterView.SubSlice>, inout dictionary: [String : AnyObject]) {
+private func setValue(value: AnyObject, forKeyPathComponents components: ArraySlice<String.CharacterView.SubSequence>, inout dictionary: [String : AnyObject]) {
 	if components.isEmpty {
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "Quick/Nimble" "v2.0.0-rc.1"`
	`1`	`+github "Quick/Nimble" "a804949542eb2f299b823ffb36936aec54fe0db6"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ private func setValue(value: AnyObject, forKey key: String, inout dictionary: [S`
`13`	`13`	`return setValue(value, forKeyPathComponents: keyComponents, dictionary: &dictionary)`
`14`	`14`	`}`
`15`	`15`
`16`		`-private func setValue(value: AnyObject, forKeyPathComponents components: ArraySlice<String.CharacterView.SubSlice>, inout dictionary: [String : AnyObject]) {`
	`16`	`+private func setValue(value: AnyObject, forKeyPathComponents components: ArraySlice<String.CharacterView.SubSequence>, inout dictionary: [String : AnyObject]) {`
`17`	`17`	`if components.isEmpty {`
`18`	`18`	`return`
`19`	`19`	`}`