diff --git a/CMakeLists.txt b/CMakeLists.txt index eb05167539450..3b412aa57bd96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "7.36.1") +set(protobuf_VERSION_STRING "7.36.2") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/MODULE.bazel b/MODULE.bazel index fb193817f6e45..5aaea575ca47b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "protobuf", - version = "36.1-dev", # Automatically updated on release + version = "36.2-dev", # Automatically updated on release bazel_compatibility = [">=8.0.0"], compatibility_level = 1, repo_name = "com_google_protobuf", diff --git a/Protobuf.podspec b/Protobuf.podspec index e23e1a8b2e2e4..cd0969477f8cf 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,7 +5,7 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '5.36.1' + s.version = '5.36.2' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 3a935d9cfc6e8..ea6ce724b90d1 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.36.1 + 3.36.2 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 27f2fccd7ae05..1031fa4df5813 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.36.1 + 3.36.2 10.0 Google Inc. netstandard2.0;net8.0 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 7a5f9e918dae7..b4413200c2edc 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 4.36.1 + 4.36.2 pom Protocol Buffers [BOM] diff --git a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java index af09d4914f3a7..2cf2b9d15fd5d 100644 --- a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java +++ b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java @@ -29,7 +29,7 @@ public enum RuntimeDomain { public static final RuntimeDomain OSS_DOMAIN = RuntimeDomain.PUBLIC; public static final int OSS_MAJOR = 4; public static final int OSS_MINOR = 36; - public static final int OSS_PATCH = 1; + public static final int OSS_PATCH = 2; public static final String OSS_SUFFIX = "-dev"; public static final RuntimeDomain DOMAIN = OSS_DOMAIN; diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index c7981f352981a..2eb0fdab4e6a6 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.36.1 + 4.36.2 protobuf-kotlin diff --git a/java/pom.xml b/java/pom.xml index f54b2b8c6b55a..d6b553483699e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.36.1 + 4.36.2 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 09faff7954c94..4a2c0eae02dcf 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 4.36.1 + 4.36.2 pom Protobuf Compiler diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index eaace4b9168ec..ade2d768aae40 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -22,7 +22,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "5.36.1" +#define PHP_PROTOBUF_VERSION "5.36.2" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff --git a/protobuf_version.bzl b/protobuf_version.bzl index b08aee0d8c2b2..a6dc114a2d05e 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,8 +1,8 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "36.1" -PROTOBUF_JAVA_VERSION = "4.36.1" -PROTOBUF_PYTHON_VERSION = "7.36.1" -PROTOBUF_PHP_VERSION = "5.36.1" -PROTOBUF_RUBY_VERSION = "4.36.1" -PROTOBUF_RUST_VERSION = "0.36.1-release" -PROTOBUF_LEGACY_RUST_VERSION = "4.36.1-release" +PROTOC_VERSION = "36.2" +PROTOBUF_JAVA_VERSION = "4.36.2" +PROTOBUF_PYTHON_VERSION = "7.36.2" +PROTOBUF_PHP_VERSION = "5.36.2" +PROTOBUF_RUBY_VERSION = "4.36.2" +PROTOBUF_RUST_VERSION = "0.36.2-release" +PROTOBUF_LEGACY_RUST_VERSION = "4.36.2-release" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 1e61a1d7b6b26..2273ed8da80ae 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -7,4 +7,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '7.36.1' +__version__ = '7.36.2' diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py index 93d96ad90e4ca..e28733b56db31 100644 --- a/python/google/protobuf/runtime_version.py +++ b/python/google/protobuf/runtime_version.py @@ -29,7 +29,7 @@ class Domain(Enum): OSS_DOMAIN = Domain.PUBLIC OSS_MAJOR = 7 OSS_MINOR = 36 -OSS_PATCH = 1 +OSS_PATCH = 2 OSS_SUFFIX = '-dev' DOMAIN = OSS_DOMAIN diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index b790b776d822e..554d5bedb751c 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "4.36.1" + s.version = "4.36.2" git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" diff --git a/ruby/pom.xml b/ruby/pom.xml index 991475f92570f..56ac47fe6cfcf 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 4.36.1 + 4.36.2 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 4.36.1 + 4.36.2 org.jruby diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 4ce049f0a8adf..e05122ad13b26 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/any.pb.h" diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 0fe08dae1dbd0..cd18dc3ee095c 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fany_2eproto_2epb_2eh #define google_2fprotobuf_2fany_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index f9b3dd0f6440e..c7362b15e1ae3 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/api.pb.h" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 998ff102459ff..1b42e637886aa 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fapi_2eproto_2epb_2eh #define google_2fprotobuf_2fapi_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc index 28ed7b679f153..eddaf2e6ab92b 100755 --- a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc +++ b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/csharp/c_sharp_features.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/compiler/csharp/c_sharp_features.pb.h" diff --git a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h index 7169aba73c47f..4912686dbae3b 100755 --- a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h +++ b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/csharp/c_sharp_features.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fcompiler_2fcsharp_2fc_5fsharp_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fcsharp_2fc_5fsharp_5ffeatures_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 7468a7744a398..7f2b4fea9eee3 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/compiler/java/java_features.pb.h" diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 1f45400a02fe4..d3677a268948b 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 51a6bd55d65d2..e68e3793a933f 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/compiler/plugin.pb.h" diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 976a9ab0f0cc5..6aa1b7c66a22b 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h index 6e5bfae75c21d..85b0e8260578e 100644 --- a/src/google/protobuf/compiler/versions.h +++ b/src/google/protobuf/compiler/versions.h @@ -53,10 +53,10 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "7.36.1-dev" -#define PROTOBUF_JAVA_VERSION_STRING "4.36.1-dev" -#define PROTOBUF_PYTHON_VERSION_STRING "7.36.1-dev" -#define PROTOBUF_RUST_VERSION_STRING "0.36.1-dev" +#define PROTOBUF_CPP_VERSION_STRING "7.36.2-dev" +#define PROTOBUF_JAVA_VERSION_STRING "4.36.2-dev" +#define PROTOBUF_PYTHON_VERSION_STRING "7.36.2-dev" +#define PROTOBUF_RUST_VERSION_STRING "0.36.2-dev" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index 1fe1179741cbc..b64cbd3481b64 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/cpp_features.pb.h" diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index c31ffeb624ec5..5c3e310ea65ba 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/cpp_file_options.pb.cc b/src/google/protobuf/cpp_file_options.pb.cc index e64836915ba3a..4f01ec7762e6c 100644 --- a/src/google/protobuf/cpp_file_options.pb.cc +++ b/src/google/protobuf/cpp_file_options.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_file_options.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/cpp_file_options.pb.h" diff --git a/src/google/protobuf/cpp_file_options.pb.h b/src/google/protobuf/cpp_file_options.pb.h index 8a3bd8954c268..5631bb5a9d709 100644 --- a/src/google/protobuf/cpp_file_options.pb.h +++ b/src/google/protobuf/cpp_file_options.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_file_options.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fcpp_5ffile_5foptions_2eproto_2epb_2eh #define google_2fprotobuf_2fcpp_5ffile_5foptions_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index b162d88f4dad1..a888f63ebaf2f 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 182e3ef7dbede..07b5bcda8fa44 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index 4f001fede830d..472d545c97f9c 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/duration.pb.h" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 44e61531c5753..fa9bce6912551 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fduration_2eproto_2epb_2eh #define google_2fprotobuf_2fduration_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index cc3f334251e3b..372ca02832bb3 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/empty.pb.h" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index d40586076eab5..72de96b179b2e 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fempty_2eproto_2epb_2eh #define google_2fprotobuf_2fempty_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 5a5f22d1b12b2..aa52315818366 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/field_mask.pb.h" diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 43802a594d55f..e3e4acfc097a9 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/json_enumvalue_options.pb.cc b/src/google/protobuf/json_enumvalue_options.pb.cc index da666d2f54d60..cc1ab7af7506e 100644 --- a/src/google/protobuf/json_enumvalue_options.pb.cc +++ b/src/google/protobuf/json_enumvalue_options.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/json_enumvalue_options.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/json_enumvalue_options.pb.h" diff --git a/src/google/protobuf/json_enumvalue_options.pb.h b/src/google/protobuf/json_enumvalue_options.pb.h index 049bc5ee683d3..2acd41050bff5 100644 --- a/src/google/protobuf/json_enumvalue_options.pb.h +++ b/src/google/protobuf/json_enumvalue_options.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/json_enumvalue_options.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fjson_5fenumvalue_5foptions_2eproto_2epb_2eh #define google_2fprotobuf_2fjson_5fenumvalue_5foptions_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/runtime_version.h b/src/google/protobuf/runtime_version.h index 8660e72fd6033..e657a3a47c4f7 100644 --- a/src/google/protobuf/runtime_version.h +++ b/src/google/protobuf/runtime_version.h @@ -18,7 +18,7 @@ #endif // PROTOBUF_OSS_VERSION_SUFFIX // The OSS versions are not stripped to avoid merging conflicts. -#define PROTOBUF_OSS_VERSION 7036001 +#define PROTOBUF_OSS_VERSION 7036002 #define PROTOBUF_OSS_VERSION_SUFFIX "-dev" #define PROTOBUF_VERSION PROTOBUF_OSS_VERSION diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 5055b3ebc4333..2a00725b8cc7c 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/source_context.pb.h" diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 4163d874e24c4..8f2d0fc0a4c8c 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 3d33ce8a01e22..ec207e6289496 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/struct.pb.h" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 78d32284182c4..f9238868765e5 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define google_2fprotobuf_2fstruct_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index d4b7bede7945d..36123c60dfcf4 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -44,7 +44,7 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 7036001 +#define GOOGLE_PROTOBUF_VERSION 7036002 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev" diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index f79dcb8878ebc..809e802093ffe 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/timestamp.pb.h" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 173fd778d538d..c26788f492c2a 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index ecd808a4f51bc..723332a6cce59 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/type.pb.h" diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 5c26022e70590..b25e9a0721346 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2ftype_2eproto_2epb_2eh #define google_2fprotobuf_2ftype_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index cf5d6a22bb045..5002a0bf84a34 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #include "google/protobuf/wrappers.pb.h" diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 715fef9a0bb9d..e8eb17a869103 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 7.36.1-dev +// Protobuf C++ Version: 7.36.2-dev #ifndef google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define google_2fprotobuf_2fwrappers_2eproto_2epb_2eh @@ -13,7 +13,7 @@ // clang-format off #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 7036001 +#if PROTOBUF_VERSION != 7036002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/version.json b/version.json index 31337fe608233..ba7b8eb1a7046 100644 --- a/version.json +++ b/version.json @@ -1,19 +1,19 @@ { "36.x": { - "protoc_version": "36.1-dev", + "protoc_version": "36.2-dev", "lts": false, - "date": "2026-08-20", + "date": "2026-08-31", "languages": { - "cpp": "7.36.1-dev", - "csharp": "3.36.1-dev", - "java": "4.36.1-dev", - "javascript": "3.36.1-dev", - "objectivec": "5.36.1-dev", - "php": "5.36.1-dev", - "python": "7.36.1-dev", - "ruby": "4.36.1-dev", - "rust": "0.36.1-dev", - "legacy_rust": "4.36.1-dev" + "cpp": "7.36.2-dev", + "csharp": "3.36.2-dev", + "java": "4.36.2-dev", + "javascript": "3.36.2-dev", + "objectivec": "5.36.2-dev", + "php": "5.36.2-dev", + "python": "7.36.2-dev", + "ruby": "4.36.2-dev", + "rust": "0.36.2-dev", + "legacy_rust": "4.36.2-dev" } } } \ No newline at end of file