Skip to content

Swift 4 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WesleyBuck wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Swift 4 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c08d09
Update to swift 4
WesleyBuck Nov 3, 2017
6fa2c1a
Fixed swift 4 warnings
WesleyBuck Nov 3, 2017
7245c68
Bumped pod spec version
WesleyBuck Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AmazonS3RequestManager.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
24 changes: 14 additions & 10 deletions Example/AmazonS3RequestManager.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand Down
4 changes: 1 addition & 3 deletions Example/Pods/Alamofire/Source/ParameterEncoding.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Alamofire/Source/Request.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

154 changes: 91 additions & 63 deletions Example/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/AmazonS3RequestManager-OSX.xcscheme
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/AmazonS3RequestManager-iOS.xcscheme
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/AmazonS3RequestManager-tvOS.xcscheme
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/SWXMLHash/Source/SWXMLHash+TypeConversion.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Tests/AmazonS3ResponseSerializationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/ResponseObjects.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
4 changes: 2 additions & 2 deletions Source/ResponseSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down