From 34219900a99473acf8f3e58b1f235c8849298441 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Tue, 23 Oct 2018 18:45:22 +0200 Subject: [PATCH] Properly updating submodule to point at 1.16. --- packages/grpc-native-core/binding.gyp | 7 ++++--- packages/grpc-native-core/build.yaml | 1 + packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index b1947b9f..6c0a986d 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.15.0-dev"' + 'GRPC_NODE_VERSION="1.16.0-pre1"' ], 'conditions': [ ['grpc_gcov=="true"', { @@ -648,6 +648,7 @@ 'deps/grpc/src/core/lib/http/format_request.cc', 'deps/grpc/src/core/lib/http/httpcli.cc', 'deps/grpc/src/core/lib/http/parser.cc', + 'deps/grpc/src/core/lib/iomgr/buffer_list.cc', 'deps/grpc/src/core/lib/iomgr/call_combiner.cc', 'deps/grpc/src/core/lib/iomgr/combiner.cc', 'deps/grpc/src/core/lib/iomgr/endpoint.cc', @@ -657,7 +658,6 @@ 'deps/grpc/src/core/lib/iomgr/error.cc', 'deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc', 'deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc', - 'deps/grpc/src/core/lib/iomgr/ev_epollsig_linux.cc', 'deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc', 'deps/grpc/src/core/lib/iomgr/ev_posix.cc', 'deps/grpc/src/core/lib/iomgr/ev_windows.cc', @@ -668,6 +668,7 @@ 'deps/grpc/src/core/lib/iomgr/gethostname_fallback.cc', 'deps/grpc/src/core/lib/iomgr/gethostname_host_name_max.cc', 'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.cc', + 'deps/grpc/src/core/lib/iomgr/internal_errqueue.cc', 'deps/grpc/src/core/lib/iomgr/iocp_windows.cc', 'deps/grpc/src/core/lib/iomgr/iomgr.cc', 'deps/grpc/src/core/lib/iomgr/iomgr_custom.cc', @@ -929,7 +930,7 @@ 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc', - 'deps/grpc/src/cpp/ext/filters/census/grpc_context.cc', + 'deps/grpc/src/core/ext/filters/census/grpc_context.cc', 'deps/grpc/src/core/ext/filters/max_age/max_age_filter.cc', 'deps/grpc/src/core/ext/filters/message_size/message_size_filter.cc', 'deps/grpc/src/core/ext/filters/http/client_authority_filter.cc', diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index 49e36fdf..92c958cd 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,2 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. + node_version: 1.16.0-pre1 \ No newline at end of file diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 8ba45636..98457b76 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 8ba45636295019b101c1e9579423d4de41c4c59e +Subproject commit 98457b76ff43efa2c3edd203c14cd923734d5279 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 9cb0cdaa..73f7698f 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.15.0-dev", + "version": "1.16.0-pre1", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",