diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-02-06 10:27:05 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-06 10:27:05 -0800 |
| commit | c4fc1da9890e4db2bbb976d424fb1cd97642d6b3 (patch) | |
| tree | 21b218b29c552ca4598e03917a350d67bf349df4 | |
| parent | 7ed3c932c968a77114691550e750b91d7231a385 (diff) | |
| parent | f0a12696738556735a3d3a46459c85d574ba4ba2 (diff) | |
Merge pull request #9534 from muxi/port-9505
Port #9505: Fixes for gRPC ObjC v1.1.0 release
| -rw-r--r-- | gRPC-Core.podspec | 13 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m | 2 | ||||
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 13 |
3 files changed, 22 insertions, 6 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 87471ab9d0..02336eec81 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -873,13 +873,22 @@ Pod::Spec.new do |s| s.subspec 'Cronet-Implementation' do |ss| ss.header_mappings_dir = '.' + + ss.dependency "#{s.name}/Interface", version + ss.dependency "#{s.name}/Implementation", version + ss.dependency "#{s.name}/Cronet-Interface", version + ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c', - 'src/core/ext/transport/cronet/transport/cronet_transport.c' + 'src/core/ext/transport/cronet/transport/cronet_transport.c', + 'third_party/objective_c/Cronet/bidirectional_stream_c.h' end s.subspec 'Tests' do |ss| ss.header_mappings_dir = '.' + ss.dependency "#{s.name}/Interface", version + ss.dependency "#{s.name}/Implementation", version + ss.source_files = 'test/core/end2end/cq_verifier.{c,h}', 'test/core/end2end/end2end_tests.{c,h}', 'test/core/end2end/end2end_test_utils.c', @@ -889,7 +898,5 @@ Pod::Spec.new do |s| 'test/core/util/port.h', 'test/core/util/port_posix.c', 'test/core/util/port_server_client.{c,h}' - - ss.dependency 'CronetFramework' end end diff --git a/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m b/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m index 40afca2d3d..0e2fa13f2c 100644 --- a/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m +++ b/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m @@ -159,11 +159,13 @@ static void PassFlagsToContextInfoBlock(SCNetworkReachabilityRef target, if (strongSelf) { if (lossHandler && !flags.reachable) { lossHandler(); +#if TARGET_OS_IPHONE } else if (wifiStatusChangeHandler && strongSelf->_previousReachabilityFlags && (flags.isWWAN ^ strongSelf->_previousReachabilityFlags.isWWAN)) { wifiStatusChangeHandler(); +#endif } strongSelf->_previousReachabilityFlags = flags; } diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 1b97d18f16..d43bcb93ef 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -166,13 +166,22 @@ s.subspec 'Cronet-Implementation' do |ss| ss.header_mappings_dir = '.' + + ss.dependency "#{s.name}/Interface", version + ss.dependency "#{s.name}/Implementation", version + ss.dependency "#{s.name}/Cronet-Interface", version + ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c', - 'src/core/ext/transport/cronet/transport/cronet_transport.c' + 'src/core/ext/transport/cronet/transport/cronet_transport.c', + 'third_party/objective_c/Cronet/bidirectional_stream_c.h' end s.subspec 'Tests' do |ss| ss.header_mappings_dir = '.' + ss.dependency "#{s.name}/Interface", version + ss.dependency "#{s.name}/Implementation", version + ss.source_files = 'test/core/end2end/cq_verifier.{c,h}', 'test/core/end2end/end2end_tests.{c,h}', 'test/core/end2end/end2end_test_utils.c', @@ -182,7 +191,5 @@ 'test/core/util/port.h', 'test/core/util/port_posix.c', 'test/core/util/port_server_client.{c,h}' - - ss.dependency 'CronetFramework' end end |