From f8372c607a9751c951092ee5a34cc78f3c718d2d Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 29 Jul 2016 09:58:55 -0700
Subject: [PATCH] Minor revisions
---
gRPC-Core.podspec | 4 ++--
src/objective-c/tests/Podfile | 8 ++++----
templates/gRPC-Core.podspec.template | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 50fc9e9e7d..ab5fbfaa6c 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -770,13 +770,13 @@ Pod::Spec.new do |s|
ss.source_files = 'include/grpc/grpc_cronet.h'
end
- s.subspec 'Cronet-Implement' do |ss|
+ s.subspec 'Cronet-Implementation' do |ss|
ss.header_mappings_dir = '.'
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
'src/core/ext/transport/cronet/transport/cronet_transport.c'
end
- s.subspec 'Cronet-Tests' do |ss|
+ s.subspec 'Tests' do |ss|
ss.header_mappings_dir = '.'
ss.source_files = 'test/core/end2end/cq_verifier.{c,h}',
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile
index 1db7321d21..067d37eccc 100644
--- a/src/objective-c/tests/Podfile
+++ b/src/objective-c/tests/Podfile
@@ -32,7 +32,7 @@ GRPC_LOCAL_SRC = '../../..'
if target_name == 'InteropTestsRemoteWithCronet'
pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c"
- pod 'gRPC-Core/Cronet-Implement', :path => GRPC_LOCAL_SRC
+ pod 'gRPC-Core/Cronet-Implementation', :path => GRPC_LOCAL_SRC
end
end
end
@@ -42,8 +42,8 @@ target 'CoreCronetEnd2EndTests' do
pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c"
pod 'gRPC-Core', :path => GRPC_LOCAL_SRC
pod 'gRPC-Core/Cronet-Interface', :path => GRPC_LOCAL_SRC
- pod 'gRPC-Core/Cronet-Implement', :path => GRPC_LOCAL_SRC
- pod 'gRPC-Core/Cronet-Tests', :path => GRPC_LOCAL_SRC
+ pod 'gRPC-Core/Cronet-Implementation', :path => GRPC_LOCAL_SRC
+ pod 'gRPC-Core/Tests', :path => GRPC_LOCAL_SRC
end
# gRPC-Core.podspec needs to be modified to be successfully used for local development. A Podfile's
@@ -82,7 +82,7 @@ post_install do |installer|
target.build_configurations.each do |config|
config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'YES'
end
- if target.name == 'gRPC-Core' or target.name == 'gRPC-Core.default-Cronet-Implement-Cronet-Interface-Cronet-Tests' or target.name == 'gRPC-Core.default-Cronet-Implement'
+ if target.name == 'gRPC-Core' or target.name == 'gRPC-Core.default-Cronet-Implementation-Cronet-Interface-Tests' or target.name == 'gRPC-Core.default-Cronet-Implementation'
target.build_configurations.each do |config|
# TODO(zyc): Remove this setting after the issue is resolved
# GPR_UNREACHABLE_CODE causes "Control may reach end of non-void
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index 6dd73414b6..644dc4a632 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -162,13 +162,13 @@
ss.source_files = 'include/grpc/grpc_cronet.h'
end
- s.subspec 'Cronet-Implement' do |ss|
+ s.subspec 'Cronet-Implementation' do |ss|
ss.header_mappings_dir = '.'
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
'src/core/ext/transport/cronet/transport/cronet_transport.c'
end
- s.subspec 'Cronet-Tests' do |ss|
+ s.subspec 'Tests' do |ss|
ss.header_mappings_dir = '.'
ss.source_files = 'test/core/end2end/cq_verifier.{c,h}',
--
GitLab