diff options
| author | ncteisen <ncteisen@gmail.com> | 2018-06-15 11:13:46 -0400 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-15 11:13:46 -0400 |
| commit | c14e95fc63302421b71f0939a71d3a2b32c8ab1f (patch) | |
| tree | 7a5a865423be974130cd24d3e70067052d6b9d8e /gRPC-C++.podspec | |
| parent | c7166ae67dd554d41b4d26286da2888aebc0153b (diff) | |
| parent | bd6ac0f9d57dda96797bbd5b1bd27815342e7ee5 (diff) | |
| download | grpc-grpc-c14e95fc63302421b71f0939a71d3a2b32c8ab1f.tar.gz | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'gRPC-C++.podspec')
| -rw-r--r-- | gRPC-C++.podspec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index ce56e514dd..d7afd5a99c 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - # version = '1.13.0-dev' + # version = '1.14.0-dev' version = '0.0.2' s.version = version s.summary = 'gRPC C++ library' @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - grpc_version = '1.13.0-dev' + grpc_version = '1.14.0-dev' s.source = { :git => 'https://github.com/grpc/grpc.git', @@ -665,9 +665,9 @@ Pod::Spec.new do |s| end s.prepare_command = <<-END_OF_COMMAND - find src/cpp/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\; - find src/cpp/ -name "*.back" -type f -delete - find src/core/ -regex ".*\.h" -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\; - find src/core/ -name "*.back" -type f -delete + find src/cpp/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' + find src/cpp/ -type f -path '*.grpc_back' -print0 | xargs -0 rm + find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' + find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end |