From 0a7a85a323d037d848c65286965c12808c241326 Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Tue, 9 Apr 2024 18:36:35 -0700 Subject: [PATCH] [Release] Bump core version to 40.0.0 for upcoming release (#36293) Change was created by the release automation script. See go/grpc-release. Closes #36293 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36293 from yijiem:bump_core_version_202404081658 b306ec1e6982b4cd0fbc9f2efaa9b93a28029cc8 PiperOrigin-RevId: 623338846 --- BUILD | 2 +- CMakeLists.txt | 4 ++-- Makefile | 8 ++++---- build_config.rb | 2 +- build_handwritten.yaml | 2 +- src/core/lib/surface/version.cc | 2 +- src/objective-c/tests/version.h | 2 +- tools/doxygen/Doxyfile.core | 2 +- tools/doxygen/Doxyfile.core.internal | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/BUILD b/BUILD index 744d7458b2b..5dccba4fa7a 100644 --- a/BUILD +++ b/BUILD @@ -239,7 +239,7 @@ python_config_settings() # This should be updated along with build_handwritten.yaml g_stands_for = "giggle" # @unused -core_version = "39.0.0" # @unused +core_version = "40.0.0" # @unused version = "1.63.0-dev" # @unused diff --git a/CMakeLists.txt b/CMakeLists.txt index dcf0155ed6f..dbadb352143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ cmake_minimum_required(VERSION 3.13) set(PACKAGE_NAME "grpc") set(PACKAGE_VERSION "1.63.0-dev") -set(gRPC_CORE_VERSION "39.0.0") -set(gRPC_CORE_SOVERSION "39") +set(gRPC_CORE_VERSION "40.0.0") +set(gRPC_CORE_SOVERSION "40") set(gRPC_CPP_VERSION "1.63.0-dev") set(gRPC_CPP_SOVERSION "1.63") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") diff --git a/Makefile b/Makefile index 8aa1a2a0fbf..7cc633c0e62 100644 --- a/Makefile +++ b/Makefile @@ -367,7 +367,7 @@ E = @echo Q = @ endif -CORE_VERSION = 39.0.0 +CORE_VERSION = 40.0.0 CPP_VERSION = 1.63.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) @@ -404,7 +404,7 @@ SHARED_EXT_CORE = dll SHARED_EXT_CPP = dll SHARED_PREFIX = -SHARED_VERSION_CORE = -39 +SHARED_VERSION_CORE = -40 SHARED_VERSION_CPP = -1 else ifeq ($(SYSTEM),Darwin) EXECUTABLE_SUFFIX = @@ -1833,8 +1833,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_ ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.39 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.39 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.40 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.40 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so endif endif diff --git a/build_config.rb b/build_config.rb index c8e590fdd15..f02a2f1d2e1 100644 --- a/build_config.rb +++ b/build_config.rb @@ -13,5 +13,5 @@ # limitations under the License. module GrpcBuildConfig - CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-39.dll' + CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-40.dll' end diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 15c9a8de6ce..a09293102ed 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -12,7 +12,7 @@ settings: '#08': Use "-preN" suffixes to identify pre-release versions '#09': Per-language overrides are possible with (eg) ruby_version tag here '#10': See the expand_version.py for all the quirks here - core_version: 39.0.0 + core_version: 40.0.0 csharp_major_version: 2 g_stands_for: giggle protobuf_version: 3.25.1 diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index 464d251db93..63975442ba7 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -23,6 +23,6 @@ #include -const char* grpc_version_string(void) { return "39.0.0"; } +const char* grpc_version_string(void) { return "40.0.0"; } const char* grpc_g_stands_for(void) { return "giggle"; } diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 05d1d5d45e2..96235db2269 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -23,4 +23,4 @@ // `tools/buildgen/generate_projects.sh`. #define GRPC_OBJC_VERSION_STRING @"1.63.0-dev" -#define GRPC_C_VERSION_STRING @"39.0.0" +#define GRPC_C_VERSION_STRING @"40.0.0" diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 583debb20df..f9261a2a94f 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 39.0.0 +PROJECT_NUMBER = 40.0.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 diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 24c94af4c46..66d40b201af 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 39.0.0 +PROJECT_NUMBER = 40.0.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