diff options
author | 2015-07-08 16:24:31 -0700 | |
---|---|---|
committer | 2015-07-08 16:24:31 -0700 | |
commit | ea94e46b0df7f1774eefea6654f1e26cc4484b00 (patch) | |
tree | b6fdb9a22ac751a78305ffb2665e886f6b6d0063 /gRPC.podspec | |
parent | feca1bf06cf6ffd8d45b86c1c51f798bad9c52f4 (diff) | |
parent | 977565c2c0d67de0ab0c147fc6cd348a1e9ea419 (diff) |
Merge branch 'master' of github.com:grpc/grpc into jwt_verifier
Diffstat (limited to 'gRPC.podspec')
-rw-r--r-- | gRPC.podspec | 52 |
1 files changed, 41 insertions, 11 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index a807e13c95..921a4ab096 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -153,14 +153,24 @@ Pod::Spec.new do |s| 'src/core/channel/census_filter.h', 'src/core/channel/channel_args.h', 'src/core/channel/channel_stack.h', - 'src/core/channel/child_channel.h', 'src/core/channel/client_channel.h', - 'src/core/channel/client_setup.h', 'src/core/channel/connected_channel.h', 'src/core/channel/context.h', 'src/core/channel/http_client_filter.h', 'src/core/channel/http_server_filter.h', 'src/core/channel/noop_filter.h', + 'src/core/client_config/client_config.h', + 'src/core/client_config/connector.h', + 'src/core/client_config/lb_policies/pick_first.h', + 'src/core/client_config/lb_policy.h', + 'src/core/client_config/resolver.h', + 'src/core/client_config/resolver_factory.h', + 'src/core/client_config/resolver_registry.h', + 'src/core/client_config/resolvers/dns_resolver.h', + 'src/core/client_config/resolvers/unix_resolver_posix.h', + 'src/core/client_config/subchannel.h', + 'src/core/client_config/subchannel_factory.h', + 'src/core/client_config/uri_parser.h', 'src/core/compression/message_compress.h', 'src/core/debug/trace.h', 'src/core/iomgr/alarm.h', @@ -203,7 +213,6 @@ Pod::Spec.new do |s| 'src/core/surface/byte_buffer_queue.h', 'src/core/surface/call.h', 'src/core/surface/channel.h', - 'src/core/surface/client.h', 'src/core/surface/completion_queue.h', 'src/core/surface/event_string.h', 'src/core/surface/init.h', @@ -230,6 +239,7 @@ Pod::Spec.new do |s| 'src/core/transport/chttp2/timeout_encoding.h', 'src/core/transport/chttp2/varint.h', 'src/core/transport/chttp2_transport.h', + 'src/core/transport/connectivity_state.h', 'src/core/transport/metadata.h', 'src/core/transport/stream_op.h', 'src/core/transport/transport.h', @@ -269,13 +279,23 @@ Pod::Spec.new do |s| 'src/core/census/grpc_context.c', 'src/core/channel/channel_args.c', 'src/core/channel/channel_stack.c', - 'src/core/channel/child_channel.c', 'src/core/channel/client_channel.c', - 'src/core/channel/client_setup.c', 'src/core/channel/connected_channel.c', 'src/core/channel/http_client_filter.c', 'src/core/channel/http_server_filter.c', 'src/core/channel/noop_filter.c', + 'src/core/client_config/client_config.c', + 'src/core/client_config/connector.c', + 'src/core/client_config/lb_policies/pick_first.c', + 'src/core/client_config/lb_policy.c', + 'src/core/client_config/resolver.c', + 'src/core/client_config/resolver_factory.c', + 'src/core/client_config/resolver_registry.c', + 'src/core/client_config/resolvers/dns_resolver.c', + 'src/core/client_config/resolvers/unix_resolver_posix.c', + 'src/core/client_config/subchannel.c', + 'src/core/client_config/subchannel_factory.c', + 'src/core/client_config/uri_parser.c', 'src/core/compression/algorithm.c', 'src/core/compression/message_compress.c', 'src/core/debug/trace.c', @@ -328,7 +348,6 @@ Pod::Spec.new do |s| 'src/core/surface/call_log_batch.c', 'src/core/surface/channel.c', 'src/core/surface/channel_create.c', - 'src/core/surface/client.c', 'src/core/surface/completion_queue.c', 'src/core/surface/event_string.c', 'src/core/surface/init.c', @@ -359,6 +378,7 @@ Pod::Spec.new do |s| 'src/core/transport/chttp2/varint.c', 'src/core/transport/chttp2/writing.c', 'src/core/transport/chttp2_transport.c', + 'src/core/transport/connectivity_state.c', 'src/core/transport/metadata.c', 'src/core/transport/stream_op.c', 'src/core/transport/transport.c', @@ -393,14 +413,24 @@ Pod::Spec.new do |s| 'src/core/channel/census_filter.h', 'src/core/channel/channel_args.h', 'src/core/channel/channel_stack.h', - 'src/core/channel/child_channel.h', 'src/core/channel/client_channel.h', - 'src/core/channel/client_setup.h', 'src/core/channel/connected_channel.h', 'src/core/channel/context.h', 'src/core/channel/http_client_filter.h', 'src/core/channel/http_server_filter.h', 'src/core/channel/noop_filter.h', + 'src/core/client_config/client_config.h', + 'src/core/client_config/connector.h', + 'src/core/client_config/lb_policies/pick_first.h', + 'src/core/client_config/lb_policy.h', + 'src/core/client_config/resolver.h', + 'src/core/client_config/resolver_factory.h', + 'src/core/client_config/resolver_registry.h', + 'src/core/client_config/resolvers/dns_resolver.h', + 'src/core/client_config/resolvers/unix_resolver_posix.h', + 'src/core/client_config/subchannel.h', + 'src/core/client_config/subchannel_factory.h', + 'src/core/client_config/uri_parser.h', 'src/core/compression/message_compress.h', 'src/core/debug/trace.h', 'src/core/iomgr/alarm.h', @@ -443,7 +473,6 @@ Pod::Spec.new do |s| 'src/core/surface/byte_buffer_queue.h', 'src/core/surface/call.h', 'src/core/surface/channel.h', - 'src/core/surface/client.h', 'src/core/surface/completion_queue.h', 'src/core/surface/event_string.h', 'src/core/surface/init.h', @@ -470,6 +499,7 @@ Pod::Spec.new do |s| 'src/core/transport/chttp2/timeout_encoding.h', 'src/core/transport/chttp2/varint.h', 'src/core/transport/chttp2_transport.h', + 'src/core/transport/connectivity_state.h', 'src/core/transport/metadata.h', 'src/core/transport/stream_op.h', 'src/core/transport/transport.h', @@ -497,9 +527,9 @@ Pod::Spec.new do |s| BAD_TIME="$DIR_TIME/time.h" GOOD_TIME="$DIR_TIME/grpc_time.h" 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" ]; + if [ -f "$BAD_TIME" ]; then - mv -f "include/$BAD_TIME" "include/$GOOD_TIME" + mv -f "$BAD_TIME" "$GOOD_TIME" fi DIR_STRING="src/core/support" |