Skip to content

Commit

Permalink
Merge pull request #409 from nicolasnoble/updating-submodule
Browse files Browse the repository at this point in the history
Updating submodule, and tagging version as 1.12.4
  • Loading branch information
nicolasnoble committed Jun 21, 2018
2 parents 8e30235 + 9963bbc commit b152c3f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions packages/grpc-native-core/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
],
'defines': [
'PB_FIELD_16BIT',
'PB_NO_PACKED_STRUCTS=1',
'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0',
'GRPC_UV'
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/build.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
settings:
'#': It's possible to have node_version here as a key to override the core's version.
node_version: 1.12.3
node_version: 1.12.4
2 changes: 1 addition & 1 deletion packages/grpc-native-core/deps/grpc
Submodule grpc updated 43 files
+1 −1 BUILD
+1 −1 CMakeLists.txt
+2 −2 Makefile
+1 −1 build.yaml
+2 −2 gRPC-C++.podspec
+1 −1 gRPC-Core.podspec
+1 −1 gRPC-ProtoRPC.podspec
+1 −1 gRPC-RxLibrary.podspec
+1 −1 gRPC.podspec
+2 −2 package.xml
+1 −2 src/compiler/objective_c_generator.cc
+3 −3 src/core/lib/iomgr/tcp_client_custom.cc
+1 −1 src/cpp/common/version_cc.cc
+1 −1 src/csharp/Grpc.Core/Version.csproj.include
+2 −2 src/csharp/Grpc.Core/VersionInfo.cs
+1 −1 src/csharp/build_packages_dotnetcli.bat
+2 −2 src/csharp/build_packages_dotnetcli.sh
+1 −1 src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+1 −1 src/objective-c/GRPCClient/private/version.h
+0 −6 src/objective-c/ProtoRPC/ProtoService.h
+1 −1 src/objective-c/tests/version.h
+1 −1 src/php/composer.json
+1 −1 src/php/ext/grpc/version.h
+12 −1 src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
+5 −0 src/python/grpcio/grpc/_cython/_cygrpc/grpc_gevent.pyx
+1 −1 src/python/grpcio/grpc/_grpcio_metadata.py
+1 −1 src/python/grpcio/grpc_version.py
+1 −1 src/python/grpcio_health_checking/grpc_version.py
+1 −1 src/python/grpcio_reflection/grpc_version.py
+1 −1 src/python/grpcio_testing/grpc_version.py
+1 −1 src/python/grpcio_tests/grpc_version.py
+1 −1 src/ruby/lib/grpc/version.rb
+1 −1 src/ruby/tools/version.rb
+0 −11 test/distrib/csharp/DistribTest/DistribTest.project.json
+27 −0 test/distrib/csharp/DistribTest/DistribTestDotNet.csproj
+0 −22 test/distrib/csharp/DistribTest/project.json
+0 −5 test/distrib/csharp/run_distrib_test.sh
+10 −7 test/distrib/csharp/run_distrib_test_dotnetcli.sh
+1 −1 test/distrib/csharp/update_version.sh
+1 −1 tools/distrib/python/grpcio_tools/grpc_version.py
+1 −4 tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
+1 −1 tools/doxygen/Doxyfile.c++
+1 −1 tools/doxygen/Doxyfile.c++.internal
2 changes: 1 addition & 1 deletion packages/grpc-native-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "1.12.3",
"version": "1.12.4",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "https://grpc.io/",
Expand Down
1 change: 1 addition & 0 deletions packages/grpc-native-core/templates/binding.gyp.template
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
],
'defines': [
'PB_FIELD_16BIT',
'PB_NO_PACKED_STRUCTS=1',
'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0',
'GRPC_UV'
Expand Down

0 comments on commit b152c3f

Please sign in to comment.