From 3aaff588e5784deee85b0be990d94cb27dd370a9 Mon Sep 17 00:00:00 2001 From: Sergey Kuryanov Date: Tue, 10 Jul 2018 20:31:41 +0300 Subject: [PATCH 1/3] Update AFNetworking 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..681991f 100644 --- a/librato-iOS.podspec +++ b/librato-iOS.podspec @@ -17,6 +17,6 @@ Pod::Spec.new do |s| s.exclude_files = 'Demo' s.requires_arc = true - s.dependency 'AFNetworking', '~> 2.0' + s.dependency 'AFNetworking', '~> 3.2' s.dependency 'Mantle', '~> 1.3' end From 54bfb7c3c28c654c117a2629239a0600059c9eeb Mon Sep 17 00:00:00 2001 From: Sergey Kuryanov Date: Tue, 10 Jul 2018 20:36:47 +0300 Subject: [PATCH 2/3] Replace deprecated mathods --- librato-iOS/Classes/LibratoClient.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/librato-iOS/Classes/LibratoClient.m b/librato-iOS/Classes/LibratoClient.m index 8a8b9fd..e601ef2 100644 --- a/librato-iOS/Classes/LibratoClient.m +++ b/librato-iOS/Classes/LibratoClient.m @@ -173,7 +173,7 @@ - (void)getMetric:(NSString *)name options:(NSDictionary *)options } NSString *path = [NSString stringWithFormat:@"metrics/%@", name]; - [self GET:path parameters:query + [self GET:path parameters:query progress:nil success:^(NSURLSessionDataTask *task, id JSON) { if (success) { @@ -230,7 +230,7 @@ - (void)sendPayload:(NSDictionary *)payload withSuccess:(ClientSuccessBlock)succ [self.queue clear]; - [self POST:@"metrics" parameters:payload + [self POST:@"metrics" parameters:payload progress:nil success:^(NSURLSessionDataTask *task, id JSON) { if (success) { From 486b24056006d246c9704a34373efa46bdb6ddac Mon Sep 17 00:00:00 2001 From: Sergey Kuryanov Date: Tue, 10 Jul 2018 22:15:35 +0300 Subject: [PATCH 3/3] Re-update AFNetworking pod --- Demo/Podfile.lock | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 60960d7..dcb1089 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,27 +1,21 @@ PODS: - - AFNetworking (2.6.3): - - AFNetworking/NSURLConnection (= 2.6.3) - - AFNetworking/NSURLSession (= 2.6.3) - - AFNetworking/Reachability (= 2.6.3) - - AFNetworking/Security (= 2.6.3) - - AFNetworking/Serialization (= 2.6.3) - - AFNetworking/UIKit (= 2.6.3) - - AFNetworking/NSURLConnection (2.6.3): + - AFNetworking (3.2.1): + - AFNetworking/NSURLSession (= 3.2.1) + - AFNetworking/Reachability (= 3.2.1) + - AFNetworking/Security (= 3.2.1) + - AFNetworking/Serialization (= 3.2.1) + - AFNetworking/UIKit (= 3.2.1) + - AFNetworking/NSURLSession (3.2.1): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/NSURLSession (2.6.3): - - AFNetworking/Reachability - - AFNetworking/Security - - AFNetworking/Serialization - - AFNetworking/Reachability (2.6.3) - - AFNetworking/Security (2.6.3) - - AFNetworking/Serialization (2.6.3) - - AFNetworking/UIKit (2.6.3): - - AFNetworking/NSURLConnection + - AFNetworking/Reachability (3.2.1) + - AFNetworking/Security (3.2.1) + - AFNetworking/Serialization (3.2.1) + - AFNetworking/UIKit (3.2.1): - AFNetworking/NSURLSession - librato-iOS (1.2.2): - - AFNetworking (~> 2.0) + - AFNetworking (~> 3.2) - Mantle (~> 1.3) - Mantle (1.5.8): - Mantle/extobjc (= 1.5.8) @@ -31,7 +25,7 @@ DEPENDENCIES: - librato-iOS (from `../librato-iOS.podspec`) SPEC REPOS: - https://github.com/CocoaPods/Specs.git: + https://github.com/cocoapods/specs.git: - AFNetworking - Mantle @@ -40,10 +34,10 @@ EXTERNAL SOURCES: :path: "../librato-iOS.podspec" SPEC CHECKSUMS: - AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60 - librato-iOS: ac4f9b431c771cccc0719e8bdade35648fac507d + AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 + librato-iOS: 2f81a2d383d2f0a7452d8f11284f33608530bdf9 Mantle: f03b2b606c3f0cabd80214ad8a2fed6b464a7359 PODFILE CHECKSUM: 5817b13129eeec85d2fa75a097e506a23de0ee12 -COCOAPODS: 1.5.0 +COCOAPODS: 1.5.3