Skip to content

Commit e4f8e0d

Browse files
Anthony MillerAnthony Miller
Anthony Miller
authored and
Anthony Miller
committed
Fixed unit tests failing after update to SWXMLHash 4.0.
Updated to Swift 3.2
1 parent 764b718 commit e4f8e0d

61 files changed

Lines changed: 1504 additions & 941 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
3.2

‎AmazonS3RequestManager.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AmazonS3RequestManager'
3-
s.version = '1.2.2'
3+
s.version = '1.2.0'
44
s.license = 'MIT'
55
s.summary = 'A Alamofire based request manager that serializes requests to the AWS S3 (Amazon Simple Storage Solution). Based on AFAmazonS3Manager'
66
s.homepage = 'https://github.com/AnthonyMDev/AmazonS3RequestManager'

‎Example/AmazonS3RequestManager.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
isa = PBXProject;
454454
attributes = {
455455
LastSwiftUpdateCheck = 0720;
456-
LastUpgradeCheck = 0820;
456+
LastUpgradeCheck = 0900;
457457
ORGANIZATIONNAME = CocoaPods;
458458
TargetAttributes = {
459459
607FACCF1AFB9204008FA782 = {
@@ -615,7 +615,7 @@
615615
);
616616
runOnlyForDeploymentPostprocessing = 0;
617617
shellPath = /bin/sh;
618-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
618+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
619619
showEnvVarsInLog = 0;
620620
};
621621
650CE2B0FEB349A33B6E2938 /* [CP] Embed Pods Frameworks */ = {
@@ -675,7 +675,7 @@
675675
);
676676
runOnlyForDeploymentPostprocessing = 0;
677677
shellPath = /bin/sh;
678-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
678+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
679679
showEnvVarsInLog = 0;
680680
};
681681
928CAAA81E5CCDF0002D52A1 /* [CP] Check Pods Manifest.lock */ = {
@@ -690,7 +690,7 @@
690690
);
691691
runOnlyForDeploymentPostprocessing = 0;
692692
shellPath = /bin/sh;
693-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
693+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
694694
showEnvVarsInLog = 0;
695695
};
696696
928CAAB11E5CCDF0002D52A1 /* [CP] Embed Pods Frameworks */ = {
@@ -735,7 +735,7 @@
735735
);
736736
runOnlyForDeploymentPostprocessing = 0;
737737
shellPath = /bin/sh;
738-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
738+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
739739
showEnvVarsInLog = 0;
740740
};
741741
928CAAC61E5CCDFC002D52A1 /* [CP] Embed Pods Frameworks */ = {
@@ -795,7 +795,7 @@
795795
);
796796
runOnlyForDeploymentPostprocessing = 0;
797797
shellPath = /bin/sh;
798-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
798+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
799799
showEnvVarsInLog = 0;
800800
};
801801
B4C347127998E5286225A885 /* [CP] Copy Pods Resources */ = {
@@ -825,7 +825,7 @@
825825
);
826826
runOnlyForDeploymentPostprocessing = 0;
827827
shellPath = /bin/sh;
828-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
828+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
829829
showEnvVarsInLog = 0;
830830
};
831831
/* End PBXShellScriptBuildPhase section */
@@ -953,14 +953,20 @@
953953
CLANG_CXX_LIBRARY = "libc++";
954954
CLANG_ENABLE_MODULES = YES;
955955
CLANG_ENABLE_OBJC_ARC = YES;
956+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
956957
CLANG_WARN_BOOL_CONVERSION = YES;
958+
CLANG_WARN_COMMA = YES;
957959
CLANG_WARN_CONSTANT_CONVERSION = YES;
958960
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
959961
CLANG_WARN_EMPTY_BODY = YES;
960962
CLANG_WARN_ENUM_CONVERSION = YES;
961963
CLANG_WARN_INFINITE_RECURSION = YES;
962964
CLANG_WARN_INT_CONVERSION = YES;
965+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
966+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
963967
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
968+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
969+
CLANG_WARN_STRICT_PROTOTYPES = YES;
964970
CLANG_WARN_SUSPICIOUS_MOVE = YES;
965971
CLANG_WARN_UNREACHABLE_CODE = YES;
966972
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1001,14 +1007,20 @@
10011007
CLANG_CXX_LIBRARY = "libc++";
10021008
CLANG_ENABLE_MODULES = YES;
10031009
CLANG_ENABLE_OBJC_ARC = YES;
1010+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10041011
CLANG_WARN_BOOL_CONVERSION = YES;
1012+
CLANG_WARN_COMMA = YES;
10051013
CLANG_WARN_CONSTANT_CONVERSION = YES;
10061014
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10071015
CLANG_WARN_EMPTY_BODY = YES;
10081016
CLANG_WARN_ENUM_CONVERSION = YES;
10091017
CLANG_WARN_INFINITE_RECURSION = YES;
10101018
CLANG_WARN_INT_CONVERSION = YES;
1019+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1020+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10111021
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1022+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1023+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10121024
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10131025
CLANG_WARN_UNREACHABLE_CODE = YES;
10141026
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎Example/AmazonS3RequestManager.xcodeproj/xcshareddata/xcschemes/OSX.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -65,6 +66,7 @@
6566
buildConfiguration = "Debug"
6667
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6768
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69+
language = ""
6870
launchStyle = "0"
6971
useCustomWorkingDirectory = "NO"
7072
ignoresPersistentStateOnLaunch = "NO"

‎Example/AmazonS3RequestManager.xcodeproj/xcshareddata/xcschemes/TVOS.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎Example/AmazonS3RequestManager.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎Example/Podfile.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PODS:
2-
- Alamofire (4.3.0)
3-
- AmazonS3RequestManager (1.1.2):
2+
- Alamofire (4.5.0)
3+
- AmazonS3RequestManager (1.2.0):
44
- Alamofire (~> 4.1)
55
- SWXMLHash (~> 4.1.0)
66
- Nimble (7.0.1)
77
- Nocilla (0.11.0)
88
- Quick (1.1.0)
9-
- SWXMLHash (4.1.0)
9+
- SWXMLHash (4.1.1)
1010

1111
DEPENDENCIES:
1212
- AmazonS3RequestManager (from `../`)
@@ -19,13 +19,13 @@ EXTERNAL SOURCES:
1919
:path: "../"
2020

2121
SPEC CHECKSUMS:
22-
Alamofire: 856a113053a7bc9cbe5d6367a555d773fc5cfef7
23-
AmazonS3RequestManager: ae4345fe11b13292be21cec484db4ca95763a96b
22+
Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
23+
AmazonS3RequestManager: 15bae8062171c21db55473f935e9a1678ab31e5b
2424
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
2525
Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c
2626
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
27-
SWXMLHash: 21340633daddd9aaf5c625ae92a26ca6dcdbfe1b
27+
SWXMLHash: 2ac748d1b7a429725d5fc99bb1177a685c4b84c7
2828

2929
PODFILE CHECKSUM: 5a93563cdbfbff414350e4c3a44380e03ca61e1c
3030

31-
COCOAPODS: 1.2.0
31+
COCOAPODS: 1.2.1

0 commit comments

Comments
 (0)