From d167fe7467ca772c071576c2208a9e5fec7552c8 Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Tue, 11 Jun 2024 12:43:57 -0700 Subject: [PATCH] [Release] Bump core version to 42.0.0 for upcoming release (#36887) Change was created by the release automation script. See go/grpc-release. Closes #36887 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36887 from XuanWang-Amos:bump_core_version_202406111526 5df15650dd623c4e8da46f5383e5af7019113df8 PiperOrigin-RevId: 642358496 --- 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 50dba1e5e71..ec8bed94f53 100644 --- a/BUILD +++ b/BUILD @@ -229,7 +229,7 @@ python_config_settings() # This should be updated along with build_handwritten.yaml g_stands_for = "gnarly" # @unused -core_version = "41.0.0" # @unused +core_version = "42.0.0" # @unused version = "1.65.0-dev" # @unused diff --git a/CMakeLists.txt b/CMakeLists.txt index d259292f9e1..c379a81ef28 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.65.0-dev") -set(gRPC_CORE_VERSION "41.0.0") -set(gRPC_CORE_SOVERSION "41") +set(gRPC_CORE_VERSION "42.0.0") +set(gRPC_CORE_SOVERSION "42") set(gRPC_CPP_VERSION "1.65.0-dev") set(gRPC_CPP_SOVERSION "1.65") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") diff --git a/Makefile b/Makefile index ccf8810741f..1d39b0f27e9 100644 --- a/Makefile +++ b/Makefile @@ -367,7 +367,7 @@ E = @echo Q = @ endif -CORE_VERSION = 41.0.0 +CORE_VERSION = 42.0.0 CPP_VERSION = 1.65.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 = -41 +SHARED_VERSION_CORE = -42 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.41 -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.41 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.42 -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.42 $(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 3de824851f1..549196641f9 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-41.dll' + CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-42.dll' end diff --git a/build_handwritten.yaml b/build_handwritten.yaml index e9eac935968..33d07a997bf 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: 41.0.0 + core_version: 42.0.0 csharp_major_version: 2 g_stands_for: gnarly protobuf_version: 3.26.1 diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index eb735f8be9d..000fa58b982 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -22,6 +22,6 @@ #include #include -const char* grpc_version_string(void) { return "41.0.0"; } +const char* grpc_version_string(void) { return "42.0.0"; } const char* grpc_g_stands_for(void) { return "gnarly"; } diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index e806a559f9e..8c4b54f4b9b 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.65.0-dev" -#define GRPC_C_VERSION_STRING @"41.0.0" +#define GRPC_C_VERSION_STRING @"42.0.0" diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index b8b53cf3caf..b22e4e30761 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 = 41.0.0 +PROJECT_NUMBER = 42.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 efd590756b0..3cb1e1de44c 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 = 41.0.0 +PROJECT_NUMBER = 42.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