diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-09-19 17:56:42 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-09-19 18:03:17 -0700 |
| commit | 37b9b9e8fd60aa011b8b49b17498d86393d0fcf0 (patch) | |
| tree | 544574dc563c4286c48e62f68f0f79917b147a65 /templates | |
| parent | f6e7b778c42da01610f914271ccddee49becb2fa (diff) | |
Rename the openssl framework to openssl_grpc to avoid conflict
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 3 | ||||
| -rw-r--r-- | templates/src/objective-c/BoringSSL-GRPC.podspec.template | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index f912154301..0604fa507b 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -174,7 +174,7 @@ ss.header_mappings_dir = '.' ss.libraries = 'z' ss.dependency "#{s.name}/Interface", version - ss.dependency 'BoringSSL-GRPC', '0.0.1' + ss.dependency 'BoringSSL-GRPC', '0.0.2' ss.dependency 'nanopb', '~> 0.3' ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS' @@ -223,5 +223,6 @@ s.prepare_command = <<-END_OF_COMMAND 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 + find src/core/ -type f -path '*.h' -or -path '*.cc' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g' END_OF_COMMAND end diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template index 986216fdbf..509806f65b 100644 --- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template +++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template @@ -43,7 +43,7 @@ Pod::Spec.new do |s| s.name = 'BoringSSL-GRPC' - version = '0.0.1' + version = '0.0.2' s.version = version s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' # Adapted from the homepage: @@ -86,7 +86,7 @@ s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' - name = 'openssl' + name = 'openssl_grpc' # When creating a dynamic framework, name it openssl.framework instead of BoringSSL.framework. # This lets users write their includes like `#include <openssl/ssl.h>` as opposed to `#include |