diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-11-01 15:23:26 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-11-01 15:23:26 -0700 |
| commit | 48d26966646e910f7dd63d428ef831178ca9315e (patch) | |
| tree | dcc525b920d46f0b1158df13d0634b0685581f60 /templates | |
| parent | 25ec99e7050ec08fe1d3eec54807222f6ba442f0 (diff) | |
| parent | 66b740a8c60df59d7c82c8f7e122369ee86d62c1 (diff) | |
Merge github.com:grpc/grpc into tfix2
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 3 | ||||
| -rw-r--r-- | templates/grpc.gemspec.template | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 5657df8521..c329d2dedc 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -116,6 +116,7 @@ s.default_subspecs = 'Interface', 'Implementation' s.compiler_flags = '-DGRPC_ARES=0' + s.libraries = 'c++' # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its # sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't @@ -174,7 +175,7 @@ 'test/core/end2end/tests/*.{c,h}', 'test/core/end2end/fixtures/*.h', 'test/core/end2end/data/*.{c,h}', - 'test/core/util/debugger_macros.{c,h}', + 'test/core/util/debugger_macros.{cc,h}', 'test/core/util/test_config.{c,h}', 'test/core/util/port.h', 'test/core/util/port.c', diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index 215d5f9df9..fb54de1c8e 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -30,7 +30,7 @@ s.platform = Gem::Platform::RUBY s.add_dependency 'google-protobuf', '~> 3.1' - s.add_dependency 'googleauth', '~> 0.5.1' + s.add_dependency 'googleauth', '>= 0.5.1', '< 0.7' s.add_dependency 'googleapis-common-protos-types', '~> 1.0.0' s.add_development_dependency 'bundler', '~> 1.9' |