diff options
| -rw-r--r-- | gRPC-C++.podspec | 109 | ||||
| -rw-r--r-- | templates/gRPC-C++.podspec.template | 14 |
2 files changed, 4 insertions, 119 deletions
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 20a7253dfc..fe50914a15 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -24,7 +24,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized # version = '1.10.0-dev' - version = '0.0.1' + version = '0.0.2' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' @@ -613,113 +613,6 @@ Pod::Spec.new do |s| 'src/core/ext/transport/inproc/inproc_transport.h' end - s.subspec 'Tests' do |ss| - ss.header_mappings_dir = '.' - - ss.dependency "#{s.name}/Interface", version - ss.dependency "#{s.name}/Implementation", version - ss.dependency "gRPC-Core/Tests", grpc_version - - ss.source_files = 'test/cpp/util/create_test_channel.cc', - 'test/cpp/util/string_ref_helper.cc', - 'test/cpp/util/subprocess.cc', - 'test/cpp/util/test_credentials_provider.cc', - 'test/cpp/util/create_test_channel.h', - 'test/cpp/util/string_ref_helper.h', - 'test/cpp/util/subprocess.h', - 'test/cpp/util/test_credentials_provider.h', - 'test/core/util/test_config.h', - 'test/core/end2end/data/ssl_test_data.h', - 'test/core/security/oauth2_utils.h', - 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h', - 'test/core/end2end/cq_verifier.h', - 'test/core/end2end/fixtures/http_proxy_fixture.h', - 'test/core/end2end/fixtures/proxy.h', - 'test/core/iomgr/endpoint_tests.h', - 'test/core/util/debugger_macros.h', - 'test/core/util/grpc_profiler.h', - 'test/core/util/histogram.h', - 'test/core/util/memory_counters.h', - 'test/core/util/mock_endpoint.h', - 'test/core/util/parse_hexstring.h', - 'test/core/util/passthru_endpoint.h', - 'test/core/util/port.h', - 'test/core/util/port_server_client.h', - 'test/core/util/slice_splitter.h', - 'test/core/util/subprocess.h', - 'test/core/util/tracer_util.h', - 'test/core/util/trickle_endpoint.h', - 'test/core/util/cmdline.h', - 'src/core/lib/gpr/arena.h', - 'src/core/lib/gpr/env.h', - 'src/core/lib/gpr/fork.h', - 'src/core/lib/gpr/host_port.h', - 'src/core/lib/gpr/mpscq.h', - 'src/core/lib/gpr/murmur_hash.h', - 'src/core/lib/gpr/spinlock.h', - 'src/core/lib/gpr/string.h', - 'src/core/lib/gpr/string_windows.h', - 'src/core/lib/gpr/thd.h', - 'src/core/lib/gpr/time_precise.h', - 'src/core/lib/gpr/tls.h', - 'src/core/lib/gpr/tls_gcc.h', - 'src/core/lib/gpr/tls_msvc.h', - 'src/core/lib/gpr/tls_pthread.h', - 'src/core/lib/gpr/tmpfile.h', - 'src/core/lib/gpr/useful.h', - 'src/core/lib/gprpp/abstract.h', - 'src/core/lib/gprpp/atomic.h', - 'src/core/lib/gprpp/atomic_with_atm.h', - 'src/core/lib/gprpp/atomic_with_std.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/profiling/timers.h', - 'src/core/ext/filters/client_channel/backup_poller.h', - 'src/core/ext/filters/client_channel/client_channel.h', - 'src/core/ext/filters/client_channel/client_channel_factory.h', - 'src/core/ext/filters/client_channel/connector.h', - 'src/core/ext/filters/client_channel/http_connect_handshaker.h', - 'src/core/ext/filters/client_channel/http_proxy.h', - 'src/core/ext/filters/client_channel/lb_policy.h', - 'src/core/ext/filters/client_channel/lb_policy_factory.h', - 'src/core/ext/filters/client_channel/lb_policy_registry.h', - 'src/core/ext/filters/client_channel/parse_address.h', - 'src/core/ext/filters/client_channel/proxy_mapper.h', - 'src/core/ext/filters/client_channel/proxy_mapper_registry.h', - 'src/core/ext/filters/client_channel/resolver.h', - 'src/core/ext/filters/client_channel/resolver_factory.h', - 'src/core/ext/filters/client_channel/resolver_registry.h', - 'src/core/ext/filters/client_channel/retry_throttle.h', - 'src/core/ext/filters/client_channel/subchannel.h', - 'src/core/ext/filters/client_channel/subchannel_index.h', - 'src/core/ext/filters/client_channel/uri_parser.h', - 'src/core/ext/filters/deadline/deadline_filter.h', - 'src/core/ext/transport/chttp2/transport/bin_decoder.h', - 'src/core/ext/transport/chttp2/transport/bin_encoder.h', - 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', - 'src/core/ext/transport/chttp2/transport/flow_control.h', - 'src/core/ext/transport/chttp2/transport/frame.h', - 'src/core/ext/transport/chttp2/transport/frame_data.h', - 'src/core/ext/transport/chttp2/transport/frame_goaway.h', - 'src/core/ext/transport/chttp2/transport/frame_ping.h', - 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', - 'src/core/ext/transport/chttp2/transport/frame_settings.h', - 'src/core/ext/transport/chttp2/transport/frame_window_update.h', - 'src/core/ext/transport/chttp2/transport/hpack_encoder.h', - 'src/core/ext/transport/chttp2/transport/hpack_parser.h', - 'src/core/ext/transport/chttp2/transport/hpack_table.h', - 'src/core/ext/transport/chttp2/transport/http2_settings.h', - 'src/core/ext/transport/chttp2/transport/huffsyms.h', - 'src/core/ext/transport/chttp2/transport/incoming_metadata.h', - 'src/core/ext/transport/chttp2/transport/internal.h', - 'src/core/ext/transport/chttp2/transport/stream_map.h', - 'src/core/ext/transport/chttp2/transport/varint.h', - 'src/core/ext/transport/chttp2/alpn/alpn.h', - 'src/core/ext/filters/http/client/http_client_filter.h', - 'src/core/ext/filters/http/message_compress/message_compress_filter.h', - 'src/core/ext/filters/http/server/http_server_filter.h' - 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 diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index c24afea09c..25981adff4 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -102,6 +102,8 @@ out = grpc_lib_files(libs, ("grpc_test_util", "gpr_test_util"), ("headers",)) return out + # Tests subspec is currently disabled since the tests currently use `grpc++` include style instead of `grpcpp`. + # TODO (mxyan): enable Tests subspec after the inclusion style is updated in `test/` directory. def grpcpp_test_util_files(libs, filegroups): out = grpc_lib_files(libs, ("grpc++_test_util",), ("src", "headers")) excl_files = grpc_test_util_files(libs) + grpcpp_private_files(libs, filegroups) @@ -129,7 +131,7 @@ s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized # version = '${settings.version}' - version = '0.0.1' + version = '0.0.2' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' @@ -191,16 +193,6 @@ ss.private_header_files = ${ruby_multiline_list(grpcpp_private_headers(libs, filegroups), 30)} end - s.subspec 'Tests' do |ss| - ss.header_mappings_dir = '.' - - ss.dependency "#{s.name}/Interface", version - ss.dependency "#{s.name}/Implementation", version - ss.dependency "gRPC-Core/Tests", grpc_version - - ss.source_files = ${ruby_multiline_list(grpcpp_test_util_files(libs, filegroups), 22)} - 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 |