From c2e8e4f28a649a647098321d3cd95a0b55312e87 Mon Sep 17 00:00:00 2001 From: Sergey Kuryanov Date: Tue, 10 Jul 2018 18:56:02 +0300 Subject: [PATCH] Update Mantle pod --- .../project.pbxproj | 61 ++++--------------- librato-iOS.podspec | 2 +- 2 files changed, 12 insertions(+), 51 deletions(-) diff --git a/Demo/librato-iOS Demo.xcodeproj/project.pbxproj b/Demo/librato-iOS Demo.xcodeproj/project.pbxproj index cbfbc7c..aad2363 100644 --- a/Demo/librato-iOS Demo.xcodeproj/project.pbxproj +++ b/Demo/librato-iOS Demo.xcodeproj/project.pbxproj @@ -193,7 +193,6 @@ 66922617180358AF00237E77 /* Frameworks */, 66922618180358AF00237E77 /* Resources */, CF311E2286F14B79A814F7BE /* [CP] Copy Pods Resources */, - 49278725AA6A48415323BBF8 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -212,8 +211,6 @@ 66922631180358AF00237E77 /* Sources */, 66922632180358AF00237E77 /* Frameworks */, 66922633180358AF00237E77 /* Resources */, - BAACFE891AE2BDA71802DAB9 /* [CP] Embed Pods Frameworks */, - B8F1461E083D696A5571BDE5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -280,34 +277,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 49278725AA6A48415323BBF8 /* [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-librato-iOS Demo/Pods-librato-iOS Demo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 56571786C5174A36B0BB4AC8 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-librato-iOS Demo-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + 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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 60F4CC329F21EB0D532804DC /* [CP] Check Pods Manifest.lock */ = { @@ -316,43 +301,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-librato-iOS DemoTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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; - }; - B8F1461E083D696A5571BDE5 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-librato-iOS DemoTests/Pods-librato-iOS DemoTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - BAACFE891AE2BDA71802DAB9 /* [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-librato-iOS DemoTests/Pods-librato-iOS DemoTests-frameworks.sh\"\n"; + 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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; CF311E2286F14B79A814F7BE /* [CP] Copy Pods Resources */ = { @@ -361,9 +319,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-librato-iOS Demo/Pods-librato-iOS Demo-resources.sh", + "${PODS_ROOT}/../../librato-iOS/Librato-Localizable.strings", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Librato-Localizable.strings", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/librato-iOS.podspec b/librato-iOS.podspec index 2c99b2e..367ce76 100644 --- a/librato-iOS.podspec +++ b/librato-iOS.podspec @@ -18,5 +18,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.dependency 'AFNetworking', '~> 2.0' - s.dependency 'Mantle', '~> 1.3' + s.dependency 'Mantle', '~> 2.1' end