From bc31f8fb2111904bbd5854de5a2adc95d9c9397c Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Thu, 24 Sep 2015 17:04:22 -0400 Subject: [PATCH] Revert "updated cartfile dependencies" This reverts commit c7320684a1300d158ba97f7a225c0827bf01aeba. --- AlamofireObjectMapper.podspec | 3 +-- Cartfile | 4 ++-- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Alamofire | 2 +- Carthage/Checkouts/ObjectMapper | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec index 893a8af..c5669c7 100644 --- a/AlamofireObjectMapper.podspec +++ b/AlamofireObjectMapper.podspec @@ -10,8 +10,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' - s.watchos.deployment_target = '2.0' - s.tvos.deployment_target = '9.0' +s.watchos.deployment_target = '2.0' s.requires_arc = 'true' s.source_files = 'AlamofireObjectMapper/**/*.swift' diff --git a/Cartfile b/Cartfile index a63e066..2ad4b4a 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "tvOS" -github "Hearst-DD/ObjectMapper" "tvOS" +github "Alamofire/Alamofire" ~> 2.0.0 +github "Hearst-DD/ObjectMapper" >= 0.16 diff --git a/Cartfile.resolved b/Cartfile.resolved index 73bcd86..ea9e454 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "241c91ef8e81b7430d7cfa4a1859cc649f54fc7c" -github "Hearst-DD/ObjectMapper" "61c91a8c71f32fc8e3adc4df296d798507bcc1e1" +github "Alamofire/Alamofire" "2.0.0" +github "Hearst-DD/ObjectMapper" "0.17" diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire index 241c91e..bd33eee 160000 --- a/Carthage/Checkouts/Alamofire +++ b/Carthage/Checkouts/Alamofire @@ -1 +1 @@ -Subproject commit 241c91ef8e81b7430d7cfa4a1859cc649f54fc7c +Subproject commit bd33eee6cf1660cbfe85b7475a3be1f4cbb7cd95 diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper index 61c91a8..5275131 160000 --- a/Carthage/Checkouts/ObjectMapper +++ b/Carthage/Checkouts/ObjectMapper @@ -1 +1 @@ -Subproject commit 61c91a8c71f32fc8e3adc4df296d798507bcc1e1 +Subproject commit 527513182e0bbb4ed2aaa1738be9d6fe20c72070