Skip to content

Commit

Permalink
work with AFNetworking 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jokefaker
jokefaker committed Jun 8, 2016
1 parent 8309edd commit 9a61ad8
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 351 deletions.
2 changes: 1 addition & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ platform :ios, '8.0'

target 'PromiseKit+AFNetworking' do

pod 'AFNetworking', '~> 2.0'
pod 'AFNetworking', '~> 3.1.0'
pod 'PromiseKit/CorePromise', '~>3.0'

end
Expand Down
54 changes: 30 additions & 24 deletions PromiseKit+AFNetworking.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
0666CC97192961BC00110C1B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0666CC95192961BC00110C1B /* InfoPlist.strings */; };
0666CC99192961BC00110C1B /* AFHTTPRequestOperation+PromiseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0666CC98192961BC00110C1B /* AFHTTPRequestOperation+PromiseTests.m */; };
06B81A8E19F3F18C00A8CF14 /* AFNetworking+PromiseKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 06B81A8D19F3F18C00A8CF14 /* AFNetworking+PromiseKit.m */; };
22B9056872DCCD914800BCCD /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E48D58E13F4BD8C3756975FE /* Pods.framework */; };
5A0FC94829A17322C5D1F8D7 /* Pods_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 240DBD0C20C6C4AC011A16AB /* Pods_Tests.framework */; };
B0214F66B71CED6A5736EDDF /* Pods_PromiseKit_AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0C33A15B665F3F4C42F5003 /* Pods_PromiseKit_AFNetworking.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -63,9 +63,12 @@
0666CC98192961BC00110C1B /* AFHTTPRequestOperation+PromiseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AFHTTPRequestOperation+PromiseTests.m"; sourceTree = "<group>"; };
06B81A8C19F3F18C00A8CF14 /* AFNetworking+PromiseKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AFNetworking+PromiseKit.h"; sourceTree = "<group>"; };
06B81A8D19F3F18C00A8CF14 /* AFNetworking+PromiseKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AFNetworking+PromiseKit.m"; sourceTree = "<group>"; };
0F4227DEF417C6F618D5918D /* Pods-PromiseKit+AFNetworking.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PromiseKit+AFNetworking.release.xcconfig"; path = "Pods/Target Support Files/Pods-PromiseKit+AFNetworking/Pods-PromiseKit+AFNetworking.release.xcconfig"; sourceTree = "<group>"; };
240DBD0C20C6C4AC011A16AB /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
468E42E9FFEFCB6B8583FCEE /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = "<group>"; };
8AEAB2E2EA0C34F16181045F /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
9FCCE12EF63ECDDA86B9B74D /* Pods-PromiseKit+AFNetworking.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PromiseKit+AFNetworking.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PromiseKit+AFNetworking/Pods-PromiseKit+AFNetworking.debug.xcconfig"; sourceTree = "<group>"; };
B0C33A15B665F3F4C42F5003 /* Pods_PromiseKit_AFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PromiseKit_AFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E48D58E13F4BD8C3756975FE /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E9A299DE9A54CE253A26E387 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
F0855C7DD91C82C533ABE940 /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = "<group>"; };
Expand All @@ -79,7 +82,7 @@
0666CC70192961BC00110C1B /* CoreGraphics.framework in Frameworks */,
0666CC72192961BC00110C1B /* UIKit.framework in Frameworks */,
0666CC6E192961BC00110C1B /* Foundation.framework in Frameworks */,
22B9056872DCCD914800BCCD /* Pods.framework in Frameworks */,
B0214F66B71CED6A5736EDDF /* Pods_PromiseKit_AFNetworking.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -127,6 +130,7 @@
0666CC8C192961BC00110C1B /* XCTest.framework */,
E48D58E13F4BD8C3756975FE /* Pods.framework */,
240DBD0C20C6C4AC011A16AB /* Pods_Tests.framework */,
B0C33A15B665F3F4C42F5003 /* Pods_PromiseKit_AFNetworking.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -185,6 +189,8 @@
8AEAB2E2EA0C34F16181045F /* Pods.release.xcconfig */,
468E42E9FFEFCB6B8583FCEE /* Pods-Tests.debug.xcconfig */,
F0855C7DD91C82C533ABE940 /* Pods-Tests.release.xcconfig */,
9FCCE12EF63ECDDA86B9B74D /* Pods-PromiseKit+AFNetworking.debug.xcconfig */,
0F4227DEF417C6F618D5918D /* Pods-PromiseKit+AFNetworking.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -196,12 +202,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 0666CC9C192961BC00110C1B /* Build configuration list for PBXNativeTarget "PromiseKit+AFNetworking" */;
buildPhases = (
2EB4A77038C243E695F8FB55 /* Check Pods Manifest.lock */,
2EB4A77038C243E695F8FB55 /* 📦 Check Pods Manifest.lock */,
0666CC66192961BC00110C1B /* Sources */,
0666CC67192961BC00110C1B /* Frameworks */,
0666CC68192961BC00110C1B /* Resources */,
F80E4859162947088BD37311 /* Copy Pods Resources */,
E1C9D1B04F115DD76A28C31F /* Embed Pods Frameworks */,
F80E4859162947088BD37311 /* 📦 Copy Pods Resources */,
E1C9D1B04F115DD76A28C31F /* 📦 Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -216,12 +222,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 0666CC9F192961BC00110C1B /* Build configuration list for PBXNativeTarget "Tests" */;
buildPhases = (
1F0DA65DEF5603F8D6F8B6F5 /* Check Pods Manifest.lock */,
1F0DA65DEF5603F8D6F8B6F5 /* 📦 Check Pods Manifest.lock */,
0666CC87192961BC00110C1B /* Sources */,
0666CC88192961BC00110C1B /* Frameworks */,
0666CC89192961BC00110C1B /* Resources */,
96CEB63E63B1122B0A17A290 /* Copy Pods Resources */,
3361F322409B62D1038B54F3 /* Embed Pods Frameworks */,
96CEB63E63B1122B0A17A290 /* 📦 Copy Pods Resources */,
3361F322409B62D1038B54F3 /* 📦 Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -288,94 +294,94 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
1F0DA65DEF5603F8D6F8B6F5 /* Check Pods Manifest.lock */ = {
1F0DA65DEF5603F8D6F8B6F5 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
2EB4A77038C243E695F8FB55 /* Check Pods Manifest.lock */ = {
2EB4A77038C243E695F8FB55 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
3361F322409B62D1038B54F3 /* Embed Pods Frameworks */ = {
3361F322409B62D1038B54F3 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
96CEB63E63B1122B0A17A290 /* Copy Pods Resources */ = {
96CEB63E63B1122B0A17A290 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E1C9D1B04F115DD76A28C31F /* Embed Pods Frameworks */ = {
E1C9D1B04F115DD76A28C31F /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PromiseKit+AFNetworking/Pods-PromiseKit+AFNetworking-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
F80E4859162947088BD37311 /* Copy Pods Resources */ = {
F80E4859162947088BD37311 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PromiseKit+AFNetworking/Pods-PromiseKit+AFNetworking-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -513,7 +519,7 @@
};
0666CC9D192961BC00110C1B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E9A299DE9A54CE253A26E387 /* Pods.debug.xcconfig */;
baseConfigurationReference = 9FCCE12EF63ECDDA86B9B74D /* Pods-PromiseKit+AFNetworking.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -529,7 +535,7 @@
};
0666CC9E192961BC00110C1B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8AEAB2E2EA0C34F16181045F /* Pods.release.xcconfig */;
baseConfigurationReference = 0F4227DEF417C6F618D5918D /* Pods-PromiseKit+AFNetworking.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand Down
Loading

0 comments on commit 9a61ad8

Please sign in to comment.