Skip to content

Commit

Permalink
fixed Almofire dependency
Browse files Browse the repository at this point in the history
updated target versions to match alamofire
  • Loading branch information
tristanhimmelman committed Feb 16, 2019
1 parent 465a3f7 commit 4896579
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions AlamofireObjectMapper.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/tristanhimmelman/AlamofireObjectMapper.git', :tag => s.version.to_s }

s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.0'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.12'
s.watchos.deployment_target = '3.0'
s.tvos.deployment_target = '10.0'

s.swift_version = '4.2'

s.requires_arc = true
s.source_files = 'AlamofireObjectMapper/**/*.swift'
s.dependency 'Alamofire', '~> 5.0.0.beta.1'
s.dependency 'Alamofire', '~> 5.0.0-beta.2'
s.dependency 'ObjectMapper', '~> 3.4'
end
4 changes: 2 additions & 2 deletions AlamofireObjectMapper.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Debug;
};
Expand All @@ -1133,7 +1133,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" "5.0.0.beta.1"
github "Alamofire/Alamofire" "5.0.0-beta.2"
github "tristanhimmelman/ObjectMapper" ~> 3.4
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" "5.0.0.beta.1"
github "Alamofire/Alamofire" "5.0.0-beta.2"
github "tristanhimmelman/ObjectMapper" "3.4.2"

0 comments on commit 4896579

Please sign in to comment.