Unified Diff: AdblockPlusSafari.xcodeproj/project.pbxproj
Issue 29375786:
Noissue - Update to CocoaPods 1.2.0 (Closed)
Base URL: https://bitbucket.org/fhd/adblockplussafariios
Patch Set:
Created Feb. 15, 2017, 9:46 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
Podfile.lock » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: AdblockPlusSafari.xcodeproj/project.pbxproj |
| =================================================================== |
| --- a/AdblockPlusSafari.xcodeproj/project.pbxproj |
| +++ b/AdblockPlusSafari.xcodeproj/project.pbxproj |
| @@ -670,17 +670,16 @@ |
| isa = PBXNativeTarget; |
| buildConfigurationList = E942B0871B76899D004B4692 /* Build configuration list for PBXNativeTarget "AdblockPlusSafariExtension" */; |
| buildPhases = ( |
| B92415449EC0B57E4BBC3A0F /* [CP] Check Pods Manifest.lock */, |
| E942B0761B76899D004B4692 /* Sources */, |
| E942B0771B76899D004B4692 /* Frameworks */, |
| E942B0781B76899D004B4692 /* Resources */, |
| E94626671C5A726800EF3119 /* ShellScript */, |
| - 93E2899D9648D660BA7B377B /* [CP] Embed Pods Frameworks */, |
| CD111057B6165330595C38B9 /* [CP] Copy Pods Resources */, |
| ); |
| buildRules = ( |
| ); |
| dependencies = ( |
| ); |
| name = AdblockPlusSafariExtension; |
| productName = AdblockPlusSafariExtension; |
| @@ -826,17 +825,17 @@ |
| ); |
| inputPaths = ( |
| ); |
| name = "[CP] 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"; |
| + 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"; |
| showEnvVarsInLog = 0; |
| }; |
| 8F506B02A780279471898E48 /* [CP] Embed Pods Frameworks */ = { |
| isa = PBXShellScriptBuildPhase; |
| buildActionMask = 2147483647; |
| files = ( |
| ); |
| inputPaths = ( |
| @@ -856,32 +855,17 @@ |
| ); |
| inputPaths = ( |
| ); |
| name = "[CP] 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; |
| - }; |
| - 93E2899D9648D660BA7B377B /* [CP] Embed Pods Frameworks */ = { |
| - isa = PBXShellScriptBuildPhase; |
| - buildActionMask = 2147483647; |
| - files = ( |
| - ); |
| - inputPaths = ( |
| - ); |
| - name = "[CP] Embed Pods Frameworks"; |
| - outputPaths = ( |
| - ); |
| - runOnlyForDeploymentPostprocessing = 0; |
| - shellPath = /bin/sh; |
| - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AdblockPlusSafariExtension/Pods-AdblockPlusSafariExtension-frameworks.sh\"\n"; |
| + 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"; |
| showEnvVarsInLog = 0; |
| }; |
| A9188B0F85C6804897FD698B /* [CP] Embed Pods Frameworks */ = { |
| isa = PBXShellScriptBuildPhase; |
| buildActionMask = 2147483647; |
| files = ( |
| ); |
| inputPaths = ( |
| @@ -901,17 +885,17 @@ |
| ); |
| inputPaths = ( |
| ); |
| name = "[CP] 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"; |
| + 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"; |
| showEnvVarsInLog = 0; |
| }; |
| C6E6E377F96DC728C7F519EA /* [CP] Copy Pods Resources */ = { |
| isa = PBXShellScriptBuildPhase; |
| buildActionMask = 2147483647; |
| files = ( |
| ); |
| inputPaths = ( |
« no previous file with comments
|
« no previous file
|
Podfile.lock » ('j')
|
no next file with comments »
