evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore previous break-out of Pods configuration as the global import links it into the wrong targets

Browse source
This commit is contained in:
Blake Watters 2013-05-10 18:11:40 -04:00
parent 7d89a1897d
commit 5bfde2ab4d
2 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
AFNetworking.xcodeproj/project.pbxproj
View file

@ -92,7 +92,6 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
12BB563617304561A5E20CE5 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; };
2544EC32173BE382004117E8 /* libAFNetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAFNetworking.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2544EC32173BE382004117E8 /* libAFNetworking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAFNetworking.a; sourceTree = BUILT_PRODUCTS_DIR; };
2544EC35173BE382004117E8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 2544EC35173BE382004117E8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
2544EC43173BE382004117E8 /* AFNetworkingTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AFNetworkingTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; 2544EC43173BE382004117E8 /* AFNetworkingTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AFNetworkingTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
@ -198,7 +197,6 @@
25C4EBFF173BFBA70083E116 /* AFNetworkingTests */, 25C4EBFF173BFBA70083E116 /* AFNetworkingTests */,
2544EC34173BE382004117E8 /* Frameworks */, 2544EC34173BE382004117E8 /* Frameworks */,
2544EC33173BE382004117E8 /* Products */, 2544EC33173BE382004117E8 /* Products */,
12BB563617304561A5E20CE5 /* Pods.xcconfig */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
@ -318,11 +316,9 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 2544EC57173BE382004117E8 /* Build configuration list for PBXNativeTarget "AFNetworking" */; buildConfigurationList = 2544EC57173BE382004117E8 /* Build configuration list for PBXNativeTarget "AFNetworking" */;
buildPhases = ( buildPhases = (
1B236131E70E4B509829D632 /* Check Pods Manifest.lock */,
2544EC2E173BE382004117E8 /* Sources */, 2544EC2E173BE382004117E8 /* Sources */,
2544EC2F173BE382004117E8 /* Frameworks */, 2544EC2F173BE382004117E8 /* Frameworks */,
2544EC30173BE382004117E8 /* CopyFiles */, 2544EC30173BE382004117E8 /* CopyFiles */,
1B83324CD2F543A0B1C9BCF3 /* Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
@ -447,34 +443,6 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
1B236131E70E4B509829D632 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
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";
};
1B83324CD2F543A0B1C9BCF3 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
};
2544EC41173BE382004117E8 /* ShellScript */ = { 2544EC41173BE382004117E8 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -683,7 +651,6 @@
}; };
2544EC58173BE382004117E8 /* Debug */ = { 2544EC58173BE382004117E8 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 12BB563617304561A5E20CE5 /* Pods.xcconfig */;
buildSettings = { buildSettings = {
DSTROOT = /tmp/AFNetworking.dst; DSTROOT = /tmp/AFNetworking.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -696,7 +663,6 @@
}; };
2544EC59173BE382004117E8 /* Release */ = { 2544EC59173BE382004117E8 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 12BB563617304561A5E20CE5 /* Pods.xcconfig */;
buildSettings = { buildSettings = {
DSTROOT = /tmp/AFNetworking.dst; DSTROOT = /tmp/AFNetworking.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;

8
Podfile
View file

@ -1,14 +1,18 @@
inhibit_all_warnings! inhibit_all_warnings!
pod 'OCMock', '2.1.1' def import_pods
pod 'Expecta', '0.2.1' pod 'OCMock', '2.1.1'
pod 'Expecta', '0.2.1'
end
target :ios do target :ios do
platform :ios, '5.0' platform :ios, '5.0'
link_with 'AFNetworkingTests' link_with 'AFNetworkingTests'
import_pods
end end
target :osx do target :osx do
platform :osx, '10.7' platform :osx, '10.7'
link_with 'AFNetworkingFrameworkTests' link_with 'AFNetworkingFrameworkTests'
import_pods
end end