Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[manual] Sync c-core 1.59.0 #216

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion native/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ g_stands_for = "generative" # @unused

core_version = "36.0.0" # @unused

version = "1.59.0-pre2" # @unused
version = "1.59.0" # @unused

GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
Expand Down
4 changes: 2 additions & 2 deletions native/CMakeLists.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/REVISION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
deb0c6257bd8d2a324a9ff63e9ece562403485ae
08cc1787de022069135004adfdd17938b5062319
2 changes: 1 addition & 1 deletion native/_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!

__version__ = """1.59.0rc2"""
__version__ = """1.59.0"""
2 changes: 1 addition & 1 deletion native/build_handwritten.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ settings:
csharp_major_version: 2
g_stands_for: generative
protobuf_version: 3.24.3
version: 1.59.0-pre2
version: 1.59.0
configs:
asan:
CC: clang
Expand Down
2 changes: 1 addition & 1 deletion native/config.m4

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/gRPC-C++.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/gRPC-Core.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/gRPC-ProtoRPC.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/gRPC-RxLibrary.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/gRPC.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions native/include/grpcpp/version_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define GRPC_CPP_VERSION_MAJOR 1
#define GRPC_CPP_VERSION_MINOR 59
#define GRPC_CPP_VERSION_PATCH 0
#define GRPC_CPP_VERSION_TAG "pre2"
#define GRPC_CPP_VERSION_STRING "1.59.0-pre2"
#define GRPC_CPP_VERSION_TAG ""
#define GRPC_CPP_VERSION_STRING "1.59.0"

#endif // GRPCPP_VERSION_INFO_H
8 changes: 4 additions & 4 deletions native/package.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/src/csharp/build/dependencies.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- This file is generated -->
<Project>
<PropertyGroup>
<GrpcCsharpVersion>2.59.0-pre2</GrpcCsharpVersion>
<GrpcCsharpVersion>2.59.0</GrpcCsharpVersion>
<GoogleProtobufVersion>3.24.3</GoogleProtobufVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCCppPlugin'
v = '1.59.0-pre2'
v = '1.59.0'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCPlugin'
v = '1.59.0-pre2'
v = '1.59.0'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion native/src/objective-c/GRPCClient/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.

#define GRPC_OBJC_VERSION_STRING @"1.59.0-pre2"
#define GRPC_OBJC_VERSION_STRING @"1.59.0"
2 changes: 1 addition & 1 deletion native/src/objective-c/tests/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.

#define GRPC_OBJC_VERSION_STRING @"1.59.0-pre2"
#define GRPC_OBJC_VERSION_STRING @"1.59.0"
#define GRPC_C_VERSION_STRING @"36.0.0"
2 changes: 1 addition & 1 deletion native/src/php/ext/grpc/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#ifndef VERSION_H
#define VERSION_H

#define PHP_GRPC_VERSION "1.59.0RC2"
#define PHP_GRPC_VERSION "1.59.0"

#endif /* VERSION_H */
2 changes: 1 addition & 1 deletion native/src/python/grpcio/grpc/_grpcio_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!

__version__ = """1.59.0rc2"""
__version__ = """1.59.0"""
2 changes: 1 addition & 1 deletion native/src/python/grpcio/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_admin/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_channelz/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_csds/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_health_checking/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_reflection/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_status/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_testing/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/python/grpcio_tests/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
2 changes: 1 addition & 1 deletion native/src/ruby/lib/grpc/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

# GRPC contains the General RPC module.
module GRPC
VERSION = '1.59.0.pre2'
VERSION = '1.59.0'
end
2 changes: 1 addition & 1 deletion native/src/ruby/tools/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

module GRPC
module Tools
VERSION = '1.59.0.pre2'
VERSION = '1.59.0'
end
end
2 changes: 1 addition & 1 deletion native/tools/distrib/python/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
PROTOBUF_VERSION = '3.24.3'
2 changes: 1 addition & 1 deletion native/tools/distrib/python/grpcio_tools/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
PROTOBUF_VERSION = '3.24.3'
2 changes: 1 addition & 1 deletion native/tools/distrib/python/xds_protos/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

VERSION = '1.59.0rc2'
VERSION = '1.59.0'
PROTOBUF_VERSION = '3.24.3'
2 changes: 1 addition & 1 deletion native/tools/doxygen/Doxyfile.c++

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/tools/doxygen/Doxyfile.c++.internal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion native/tools/doxygen/Doxyfile.objc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Objective-C"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.59.0-pre2
PROJECT_NUMBER = 1.59.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion native/tools/doxygen/Doxyfile.objc.internal
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Objective-C"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.59.0-pre2
PROJECT_NUMBER = 1.59.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion native/tools/doxygen/Doxyfile.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.59.0-pre2
PROJECT_NUMBER = 1.59.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down