updated cartfile dependencies

tristanhimmelman · Sep 24, 2015 · c732068 · c732068
1 parent dc519d9
commit c732068
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec
@@ -10,7 +10,8 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.9'
-s.watchos.deployment_target = '2.0'
+  s.watchos.deployment_target = '2.0'
+  s.tvos.deployment_target = '9.0'
 
   s.requires_arc = 'true'
   s.source_files = 'AlamofireObjectMapper/**/*.swift'

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" ~> 2.0.0
-github "Hearst-DD/ObjectMapper" >= 0.16
+github "Alamofire/Alamofire" "tvOS"
+github "Hearst-DD/ObjectMapper" "tvOS"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "2.0.0"
-github "Hearst-DD/ObjectMapper" "0.17"
+github "Alamofire/Alamofire" "241c91ef8e81b7430d7cfa4a1859cc649f54fc7c"
+github "Hearst-DD/ObjectMapper" "61c91a8c71f32fc8e3adc4df296d798507bcc1e1"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper
+3 −0		.travis.yml
+1 −0		Alamofire.podspec
+311 −4		Alamofire.xcodeproj/project.pbxproj
+114 −0		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire tvOS.xcscheme
+0 −5		CHANGELOG.md
+5 −5		README.md
+1 −1		Source/MultipartFormData.swift
+1 −1		Tests/DownloadTests.swift
+1 −1		Tests/NSURLSessionConfiguration+AlamofireTests.swift