From 89ecbaf94e46b0e1bb3ae834de18bf9ab8bddd7b Mon Sep 17 00:00:00 2001 From: Johan Delouche Date: Sat, 22 Sep 2018 10:00:18 +0200 Subject: [PATCH 1/2] Remove copy framwork run script causing nested framework. --- .../project.pbxproj | 63 ------------------- 1 file changed, 63 deletions(-) diff --git a/AFNetworkActivityLogger.xcodeproj/project.pbxproj b/AFNetworkActivityLogger.xcodeproj/project.pbxproj index 1615f51..1d0f9fe 100644 --- a/AFNetworkActivityLogger.xcodeproj/project.pbxproj +++ b/AFNetworkActivityLogger.xcodeproj/project.pbxproj @@ -345,7 +345,6 @@ 29D77A9E1BCC49C9005B1EF5 /* Frameworks */, 29D77A9F1BCC49C9005B1EF5 /* Headers */, 29D77AA01BCC49C9005B1EF5 /* Resources */, - 29D77AAD1BCC4A12005B1EF5 /* ShellScript */, ); buildRules = ( ); @@ -365,7 +364,6 @@ 29D77AB21BCC4BDD005B1EF5 /* Headers */, 29D77AB31BCC4BDD005B1EF5 /* Resources */, 29D77AC01BCC4C7F005B1EF5 /* CopyFiles */, - 29D77AC31BCC4C96005B1EF5 /* ShellScript */, ); buildRules = ( ); @@ -384,7 +382,6 @@ 29D77AC51BCC4D4D005B1EF5 /* Frameworks */, 29D77AC61BCC4D4D005B1EF5 /* Headers */, 29D77AC71BCC4D4D005B1EF5 /* Resources */, - 29D77AD71BCC4DC5005B1EF5 /* ShellScript */, ); buildRules = ( ); @@ -403,7 +400,6 @@ 29D96E611BCC34CD00F571A5 /* Frameworks */, 29D96E621BCC34CD00F571A5 /* Headers */, 29D96E631BCC34CD00F571A5 /* Resources */, - 29D96E771BCC36E700F571A5 /* ShellScript */, ); buildRules = ( ); @@ -559,65 +555,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 29D77AAD1BCC4A12005B1EF5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/Mac/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 29D77AC31BCC4C96005B1EF5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/watchOS/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 29D77AD71BCC4DC5005B1EF5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/tvOS/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 29D96E771BCC36E700F571A5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 297DF57D1C1F1CA2001FA807 /* Sources */ = { isa = PBXSourcesBuildPhase; From 8c1911dfc463998bf3c811e3bfbdcb4fd524685e Mon Sep 17 00:00:00 2001 From: Johan Delouche Date: Sat, 22 Sep 2018 10:54:03 +0200 Subject: [PATCH 2/2] Replace Start by Finish in finish block comment. --- Tests/AFNetworkActivityLoggerTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/AFNetworkActivityLoggerTests.m b/Tests/AFNetworkActivityLoggerTests.m index f5ad10d..a035e24 100644 --- a/Tests/AFNetworkActivityLoggerTests.m +++ b/Tests/AFNetworkActivityLoggerTests.m @@ -214,7 +214,7 @@ - (void)testThatFilterPredicateIsRespectedForFinishCallback { [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elapsedTime, NSError *error) { - XCTFail(@"Start block should not be called"); + XCTFail(@"Finish block should not be called"); }]; NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(NSURLRequest * _Nonnull request, NSDictionary * _Nullable bindings) {