fix

tristanhimmelman · Nov 18, 2016 · 9b01402 · 9b01402
1 parent e5ef616
commit 9b01402
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
 github "Alamofire/Alamofire" "4.1.0"
-github "Hearst-DD/ObjectMapper" "2.0.0"
+github "Hearst-DD/ObjectMapper" "2.2.1"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper
+1 −0		.swift-version
+13 −13		.travis.yml
+3 −3		Alamofire.podspec
+33 −75		Alamofire.xcodeproj/project.pbxproj
+8 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme
+9 −9		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire macOS.xcscheme
+8 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire tvOS.xcscheme
+1 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire watchOS.xcscheme
+1 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Cleanup Whitespace.xcscheme
+155 −2		CHANGELOG.md
+1 −1		CONTRIBUTING.md
+10 −10		Documentation/Alamofire 4.0 Migration Guide.md
+7 −5		Example/iOS Example.xcodeproj/project.pbxproj
+8 −1		Example/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme
+2 −1		Package.swift
+24 −22		README.md
+13 −3		Source/AFError.swift
+13 −4		Source/Alamofire.swift
+1 −0		Source/DispatchQueue+Alamofire.swift
+1 −1		Source/Info-tvOS.plist
+1 −1		Source/Info.plist
+1 −1		Source/MultipartFormData.swift
+33 −1		Source/ParameterEncoding.swift
+41 −25		Source/Request.swift
+57 −17		Source/SessionDelegate.swift
+132 −34		Source/SessionManager.swift
+21 −19		Source/TaskDelegate.swift
+6 −6		Source/Validation.swift
+5 −7		Tests/BaseTestCase.swift
+44 −16		Tests/CacheTests.swift
+118 −32		Tests/DownloadTests.swift
+15 −32		Tests/FileManager+AlamofireTests.swift
+38 −53		Tests/MultipartFormDataTests.swift
+1 −1		Tests/ParameterEncodingTests.swift
+1 −1		Tests/RequestTests.swift
+1 −1		Tests/ResponseSerializationTests.swift
+7 −3		Tests/ServerTrustPolicyTests.swift
+48 −34		Tests/SessionDelegateTests.swift
+124 −5		Tests/SessionManagerTests.swift
+16 −0		Tests/TLSEvaluationTests.swift
+9 −3		Tests/URLProtocolTests.swift
+16 −19		Tests/UploadTests.swift