diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2015-06-22 19:04:15 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2015-06-23 21:13:29 -0700 |
| commit | 59bb9d7d5616c4ba722d18e9158db6c966b87129 (patch) | |
| tree | aed28306ba79aa237bc7020dd8abc6ca48825462 | |
| parent | 870af21d65b6b21bb2dd6127797eee86c1aef727 (diff) | |
Have Cocoapods rename includes in the core wrapper
| -rw-r--r-- | gRPC.podspec | 4 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/GRPCCall.m | 2 | ||||
| -rw-r--r-- | templates/gRPC.podspec.template | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 2d3be88403..7d1c407200 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -82,7 +82,7 @@ Pod::Spec.new do |s| DIR_TIME="grpc/support" BAD_TIME="$DIR_TIME/time.h" GOOD_TIME="$DIR_TIME/grpc_time.h" - grep -rl "$BAD_TIME" grpc src/core | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g + grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g if [ -f "include/$BAD_TIME" ]; then mv -f "include/$BAD_TIME" "include/$GOOD_TIME" @@ -91,7 +91,7 @@ Pod::Spec.new do |s| DIR_STRING="src/core/support" BAD_STRING="$DIR_STRING/string.h" GOOD_STRING="$DIR_STRING/grpc_string.h" - grep -rl "$BAD_STRING" grpc src/core | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g + grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g if [ -f "$BAD_STRING" ]; then mv -f "$BAD_STRING" "$GOOD_STRING" diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m index a9625a1799..77eebeff76 100644 --- a/src/objective-c/GRPCClient/GRPCCall.m +++ b/src/objective-c/GRPCClient/GRPCCall.m @@ -34,7 +34,7 @@ #import "GRPCCall.h" #include <grpc/grpc.h> -#include <grpc/support/grpc_time.h> +#include <grpc/support/time.h> #import "GRPCMethodName.h" #import "private/GRPCChannel.h" diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index f59b6a9ab1..093df72eae 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -113,7 +113,7 @@ Pod::Spec.new do |s| DIR_TIME="grpc/support" BAD_TIME="$DIR_TIME/time.h" GOOD_TIME="$DIR_TIME/grpc_time.h" - grep -rl "$BAD_TIME" grpc src/core | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g + grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g if [ -f "include/$BAD_TIME" ]; then mv -f "include/$BAD_TIME" "include/$GOOD_TIME" @@ -122,7 +122,7 @@ Pod::Spec.new do |s| DIR_STRING="src/core/support" BAD_STRING="$DIR_STRING/string.h" GOOD_STRING="$DIR_STRING/grpc_string.h" - grep -rl "$BAD_STRING" grpc src/core | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g + grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g if [ -f "$BAD_STRING" ]; then mv -f "$BAD_STRING" "$GOOD_STRING" |