diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec index 6e85429..8381db4 100644 --- a/AlamofireObjectMapper.podspec +++ b/AlamofireObjectMapper.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "AlamofireObjectMapper" - s.version = "6.0.0" + s.version = "6.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" diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj index bcb8ab8..34999b2 100644 --- a/AlamofireObjectMapper.xcodeproj/project.pbxproj +++ b/AlamofireObjectMapper.xcodeproj/project.pbxproj @@ -534,6 +534,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 6AB2A0071AF26C36001EBB20; @@ -834,7 +835,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACOSX_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -888,7 +889,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACOSX_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Cartfile b/Cartfile index 4283879..b88c036 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "5.0.0-beta.2" +github "Alamofire/Alamofire" "5.0.0-beta.6" github "tristanhimmelman/ObjectMapper" ~> 3.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 0713f3a..7bb1668 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "5.0.0-beta.2" -github "tristanhimmelman/ObjectMapper" "3.4.2" +github "Alamofire/Alamofire" "5.0.0-beta.6" +github "tristanhimmelman/ObjectMapper" "3.5.1" diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire index 77cff54..e4371be 160000 --- a/Carthage/Checkouts/Alamofire +++ b/Carthage/Checkouts/Alamofire @@ -1 +1 @@ -Subproject commit 77cff54fba997ec3b6cf5c287602948a89582663 +Subproject commit e4371be5f83354f94dc82227a6c17d5010187087