Merge pull request #176 from katsuyax/feature/iOS8

support iOS8
tristanhimmelman · Nov 27, 2016 · ebcdba3 · ebcdba3
2 parents 92bace8 + 9b01402
commit ebcdba3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec
@@ -8,13 +8,13 @@ Pod::Spec.new do |s|
   s.author = { "Tristan Himmelman" => "[email protected]" }
   s.source = { :git => 'https://github.com/tristanhimmelman/AlamofireObjectMapper.git', :tag => s.version.to_s }
 
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.11'
   s.watchos.deployment_target = '2.0'
-  s.tvos.deployment_target = '9.0'
+  s.tvos.deployment_target = '8.0'
 
   s.requires_arc = 'true'
   s.source_files = 'AlamofireObjectMapper/**/*.swift'
-  s.dependency 'Alamofire', '~> 4.0'
+  s.dependency 'Alamofire', '~> 4.1'
   s.dependency 'ObjectMapper', '~> 2.0'
 end
diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj
@@ -809,7 +809,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -851,7 +851,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -875,7 +875,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AlamofireObjectMapper/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = AlamofireObjectMapper;
@@ -899,7 +899,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AlamofireObjectMapper/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = AlamofireObjectMapper;

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" ~> 4.0 
+github "Alamofire/Alamofire" ~> 4.1 
 github "Hearst-DD/ObjectMapper" ~> 2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "4.0.0"
-github "Hearst-DD/ObjectMapper" "2.0.0"
+github "Alamofire/Alamofire" "4.1.0"
+github "Hearst-DD/ObjectMapper" "2.2.1"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper
+1 −0		.swift-version
+13 −13		.travis.yml
+3 −3		Alamofire.podspec
+33 −75		Alamofire.xcodeproj/project.pbxproj
+8 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme
+9 −9		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire macOS.xcscheme
+8 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire tvOS.xcscheme
+1 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire watchOS.xcscheme
+1 −1		Alamofire.xcodeproj/xcshareddata/xcschemes/Cleanup Whitespace.xcscheme
+155 −2		CHANGELOG.md
+1 −1		CONTRIBUTING.md
+10 −10		Documentation/Alamofire 4.0 Migration Guide.md
+7 −5		Example/iOS Example.xcodeproj/project.pbxproj
+8 −1		Example/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme
+2 −1		Package.swift
+24 −22		README.md
+13 −3		Source/AFError.swift
+13 −4		Source/Alamofire.swift
+1 −0		Source/DispatchQueue+Alamofire.swift
+1 −1		Source/Info-tvOS.plist
+1 −1		Source/Info.plist
+1 −1		Source/MultipartFormData.swift
+33 −1		Source/ParameterEncoding.swift
+41 −25		Source/Request.swift
+57 −17		Source/SessionDelegate.swift
+132 −34		Source/SessionManager.swift
+21 −19		Source/TaskDelegate.swift
+6 −6		Source/Validation.swift
+5 −7		Tests/BaseTestCase.swift
+44 −16		Tests/CacheTests.swift
+118 −32		Tests/DownloadTests.swift
+15 −32		Tests/FileManager+AlamofireTests.swift
+38 −53		Tests/MultipartFormDataTests.swift
+1 −1		Tests/ParameterEncodingTests.swift
+1 −1		Tests/RequestTests.swift
+1 −1		Tests/ResponseSerializationTests.swift
+7 −3		Tests/ServerTrustPolicyTests.swift
+48 −34		Tests/SessionDelegateTests.swift
+124 −5		Tests/SessionManagerTests.swift
+16 −0		Tests/TLSEvaluationTests.swift
+9 −3		Tests/URLProtocolTests.swift
+16 −19		Tests/UploadTests.swift