updated pod spec

tristanhimmelman · Sep 24, 2015 · 51bb985 · 51bb985
1 parent bc31f8f
commit 51bb985
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = "AlamofireObjectMapper"
-  s.version = "0.9"
+  s.version = "1.0"
   s.license = { :type => "MIT", :file => "LICENSE" }
   s.summary = "An extension to Alamofire which automatically converts JSON response data into swift objects using ObjectMapper"
   s.homepage = "https://github.com/tristanhimmelman/AlamofireObjectMapper"
@@ -10,7 +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.watchos.deployment_target = '2.0'
 
   s.requires_arc = 'true'
   s.source_files = 'AlamofireObjectMapper/**/*.swift'

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "2.0.0"
+github "Alamofire/Alamofire" "2.0.2"
 github "Hearst-DD/ObjectMapper" "0.17"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
+1 −1		Alamofire.podspec
+8 −0		Alamofire.xcodeproj/project.pbxproj
+37 −8		CHANGELOG.md
+11 −5		README.md
+1 −1		Source/Info.plist
+19 −0		Source/Manager.swift
+30 −2		Source/ParameterEncoding.swift
+17 −2		Tests/ParameterEncodingTests.swift
+31 −0		Tests/String+AlamofireTests.swift