diff --git a/AmazonS3RequestManager.podspec b/AmazonS3RequestManager.podspec index 10843de..f08dbd3 100644 --- a/AmazonS3RequestManager.podspec +++ b/AmazonS3RequestManager.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'AmazonS3RequestManager' -s.version = '1.2.0' +s.version = '1.3.0' s.license = 'MIT' s.summary = 'A Alamofire based request manager that serializes requests to the AWS S3 (Amazon Simple Storage Solution). Based on AFAmazonS3Manager' s.homepage = 'https://github.com/AnthonyMDev/AmazonS3RequestManager' diff --git a/Example/AmazonS3RequestManager.xcodeproj/project.pbxproj b/Example/AmazonS3RequestManager.xcodeproj/project.pbxproj index 0f59138..03b9f62 100644 --- a/Example/AmazonS3RequestManager.xcodeproj/project.pbxproj +++ b/Example/AmazonS3RequestManager.xcodeproj/project.pbxproj @@ -458,12 +458,12 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0910; ProvisioningStyle = Manual; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0910; ProvisioningStyle = Automatic; TestTargetID = 607FACCF1AFB9204008FA782; }; @@ -1058,7 +1058,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1075,7 +1076,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1098,7 +1100,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Tests/AmazonS3RequestManager_Tests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOS-Example.app/iOS-Example"; }; name = Debug; @@ -1116,7 +1119,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Tests/AmazonS3RequestManager_Tests-Bridging-Header.h"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOS-Example.app/iOS-Example"; }; name = Release; @@ -1134,7 +1138,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.anthonymdev.OSX-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = Debug; @@ -1151,7 +1155,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.anthonymdev.OSX-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = Release; @@ -1207,7 +1211,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.anthonymdev.OSX-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -1224,7 +1228,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.anthonymdev.OSX-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Example/Pods/Alamofire/Source/ParameterEncoding.swift b/Example/Pods/Alamofire/Source/ParameterEncoding.swift index 959af6f..41ddf39 100644 --- a/Example/Pods/Alamofire/Source/ParameterEncoding.swift +++ b/Example/Pods/Alamofire/Source/ParameterEncoding.swift @@ -221,9 +221,7 @@ public struct URLEncoding: ParameterEncoding { while index != string.endIndex { let startIndex = index let endIndex = string.index(index, offsetBy: batchSize, limitedBy: string.endIndex) ?? string.endIndex - let range = startIndex.. String { let textVal = text - if !textVal.characters.isEmpty { + if !textVal.isEmpty { return textVal } diff --git a/Example/Tests/AmazonS3ResponseSerializationTests.swift b/Example/Tests/AmazonS3ResponseSerializationTests.swift index 717e494..575d91e 100644 --- a/Example/Tests/AmazonS3ResponseSerializationTests.swift +++ b/Example/Tests/AmazonS3ResponseSerializationTests.swift @@ -288,7 +288,7 @@ class AmazonS3ResponseSerializationTests: XCTestCase { // given let failureReason = "No meta data was found." - let userInfo: [AnyHashable: Any] = [NSLocalizedFailureReasonErrorKey: failureReason] + let userInfo: [String: Any] = [NSLocalizedFailureReasonErrorKey: failureReason] let expectedError = NSError(domain: S3Error.Domain, code: AFError.responseSerializationFailed(reason: .inputDataNil)._code, userInfo: userInfo) diff --git a/Source/ResponseObjects.swift b/Source/ResponseObjects.swift index 7a13a5e..6382a85 100644 --- a/Source/ResponseObjects.swift +++ b/Source/ResponseObjects.swift @@ -126,7 +126,7 @@ public final class S3ObjectMetaData: ResponseObjectSerializable { for (header,value) in headers { let prefix = "x-amz-meta-" if header.hasPrefix(prefix) { - let trimmedHeaderName = header.substring(from: prefix.characters.index(prefix.startIndex, offsetBy: prefix.characters.count)) + let trimmedHeaderName = String(header[prefix.index(prefix.startIndex, offsetBy: prefix.count)...]) metaData[trimmedHeaderName] = value } } diff --git a/Source/ResponseSerialization.swift b/Source/ResponseSerialization.swift index 8e98d8c..9d9da8f 100644 --- a/Source/ResponseSerialization.swift +++ b/Source/ResponseSerialization.swift @@ -59,7 +59,7 @@ extension DataRequest { } else { let failureReason = "XML could not be serialized into response object: \(xml)" - let userInfo: [AnyHashable: Any] = [NSLocalizedFailureReasonErrorKey: failureReason] + let userInfo: [String: Any] = [NSLocalizedFailureReasonErrorKey: failureReason] let errorCode = AFError.responseSerializationFailed(reason: .inputDataNil)._code let error = NSError(domain: S3Error.Domain, code: errorCode, userInfo: userInfo) return .failure(error) @@ -154,7 +154,7 @@ extension DataRequest { guard let metaData = S3ObjectMetaData(response: response) else { let failureReason = "No meta data was found." - let userInfo: [AnyHashable: Any] = [NSLocalizedFailureReasonErrorKey: failureReason] + let userInfo: [String: Any] = [NSLocalizedFailureReasonErrorKey: failureReason] let errorCode = AFError.responseSerializationFailed(reason: .inputDataNil)._code let error = NSError(domain: S3Error.Domain, code: errorCode, userInfo: userInfo) return .failure(error)