diff options
author | Protobuf Team Bot <protobuf-team-bot@google.com> | 2023-11-15 10:52:59 -0800 |
---|---|---|
committer | Protobuf Team Bot <protobuf-team-bot@google.com> | 2023-11-15 10:52:59 -0800 |
commit | 6ac04475591db12de14e89d3d750519c2ca9a4cc (patch) | |
tree | 0e85f390f7b1bb821a878c4eb8e5730d222afaa4 | |
parent | 7f94235e552599141950d7a4a3eaf93bc87d1b22 (diff) | |
download | protobuf-6ac04475591db12de14e89d3d750519c2ca9a4cc.tar.gz |
Updating version.json and repo version numbers to: 25.2-dev
38 files changed, 71 insertions, 71 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4137ce2e9..162fb1c72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "4.25.1") +set(protobuf_VERSION_STRING "4.25.2") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index d54f5ff49..6a0264079 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '4.25.1' + s.version = '4.25.2' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' diff --git a/Protobuf.podspec b/Protobuf.podspec index 041e36e93..a91120f3d 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 = '3.25.1' + s.version = '3.25.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 ae7a6529c..ea8794149 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ <title>Google Protocol Buffers tools</title> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <description>See project site for more info.</description> - <version>3.25.1</version> + <version>3.25.2</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl> diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index d6238c437..3924aa568 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Copyright>Copyright 2015, Google Inc.</Copyright> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle> - <VersionPrefix>3.25.1</VersionPrefix> + <VersionPrefix>3.25.2</VersionPrefix> <LangVersion>10.0</LangVersion> <Authors>Google Inc.</Authors> <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks> diff --git a/java/README.md b/java/README.md index 51818672a..b1cf3fdb1 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </dependency> ``` @@ -37,14 +37,14 @@ protobuf-java-util package: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </dependency> ``` ### Gradle If you are using Gradle, add the following to your `build.gradle` file's -dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.1'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.2'` Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 19487e1f9..8ddef64ba 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-bom</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name> diff --git a/java/core/pom.xml b/java/core/pom.xml index c0987a5da..2e1ad7b79 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 94d04526e..e0f49431c 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </parent> <artifactId>protobuf-kotlin-lite</artifactId> diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index a7cbff5e0..30f547c86 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </parent> <artifactId>protobuf-kotlin</artifactId> diff --git a/java/lite.md b/java/lite.md index 859d24c5d..19c5ce9d7 100644 --- a/java/lite.md +++ b/java/lite.md @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-javalite</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </dependency> ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 6fb3478b5..713d6ad77 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </parent> <artifactId>protobuf-javalite</artifactId> diff --git a/java/pom.xml b/java/pom.xml index 421fecc44..e1c37eae2 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 309288c3c..c01d9fce1 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protoc</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff --git a/java/util/pom.xml b/java/util/pom.xml index a637a8e67..0b71f6aae 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </parent> <artifactId>protobuf-java-util</artifactId> diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 8470e03ab..3aea21667 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "3.25.1" +#define PHP_PROTOBUF_VERSION "3.25.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 162ee8fe1..5b4556885 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,6 +1,6 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "25.1" -PROTOBUF_JAVA_VERSION = "3.25.1" -PROTOBUF_PYTHON_VERSION = "4.25.1" -PROTOBUF_PHP_VERSION = "3.25.1" -PROTOBUF_RUBY_VERSION = "3.25.1" +PROTOC_VERSION = "25.2" +PROTOBUF_JAVA_VERSION = "3.25.2" +PROTOBUF_PYTHON_VERSION = "4.25.2" +PROTOBUF_PHP_VERSION = "3.25.2" +PROTOBUF_RUBY_VERSION = "3.25.2" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 1941833c8..2f627e3f6 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__ = '4.25.1' +__version__ = '4.25.2' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index e6074ebc5..b6ab32b81 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 = "3.25.1" + s.version = "3.25.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 5cbc5ee2c..426ffdf61 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ <groupId>com.google.protobuf.jruby</groupId> <artifactId>protobuf-jruby</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> <name>Protocol Buffer JRuby native extension</name> <description> Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.25.1</version> + <version>3.25.2</version> </dependency> <dependency> <groupId>org.jruby</groupId> diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index b9c4ada87..36262de54 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/any.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index e5cb6e3d5..3fa4430d9 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/api.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 9a3e49781..76aeb030d 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index c590ff651..75ba11465 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h index e5a334bc7..6f3285f96 100644 --- a/src/google/protobuf/compiler/versions.h +++ b/src/google/protobuf/compiler/versions.h @@ -46,8 +46,8 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "4.25.1" PROTOBUF_GENCODE_VERSION_SUFFIX -#define PROTOBUF_JAVA_VERSION_STRING "3.25.1" PROTOBUF_GENCODE_VERSION_SUFFIX -#define PROTOBUF_PYTHON_VERSION_STRING "4.25.1" PROTOBUF_GENCODE_VERSION_SUFFIX +#define PROTOBUF_CPP_VERSION_STRING "4.25.2-dev" PROTOBUF_GENCODE_VERSION_SUFFIX +#define PROTOBUF_JAVA_VERSION_STRING "3.25.2-dev" PROTOBUF_GENCODE_VERSION_SUFFIX +#define PROTOBUF_PYTHON_VERSION_STRING "4.25.2-dev" PROTOBUF_GENCODE_VERSION_SUFFIX #endif // GOOGLE_PROTOBUF_VERSIONS_H__ diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 9fe0eeeb6..5d3c63f23 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 4af9f3e6d..afcb37163 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 80e30bde9..96324a1db 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/duration.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index cfca1995d..6f4614d81 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/empty.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 15ab3f689..f26590b09 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 25abc3039..37d469f88 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -204,7 +204,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), #ifdef PROTOBUF_VERSION #error PROTOBUF_VERSION was previously defined #endif -#define PROTOBUF_VERSION 4025001 +#define PROTOBUF_VERSION 4025002 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined @@ -219,7 +219,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "" +#define PROTOBUF_VERSION_SUFFIX "-dev" #ifdef PROTOBUF_MINIMUM_EDITION #error PROTOBUF_MINIMUM_EDITION was previously defined diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index d7fba167b..6e79deba8 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 594c98060..d14c7e12d 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/struct.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 5f9473494..b989490cd 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -44,10 +44,10 @@ 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 4025001 +#define GOOGLE_PROTOBUF_VERSION 4025002 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index b2c454a2e..fd9670f66 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index d8a42891d..3bc7a1b3b 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/type.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 02819d321..20341bd91 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 4.25.1 +// Protobuf C++ Version: 4.25.2-dev #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh @@ -17,7 +17,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4025001 < PROTOBUF_MIN_PROTOC_VERSION +#if 4025002 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff --git a/version.json b/version.json index b5f66a35e..8cd3a8828 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "25.x": { - "protoc_version": "25.1", + "protoc_version": "25.2-dev", "lts": false, "date": "2023-11-15", "languages": { - "cpp": "4.25.1", - "csharp": "3.25.1", - "java": "3.25.1", - "javascript": "3.25.1", - "objectivec": "3.25.1", - "php": "3.25.1", - "python": "4.25.1", - "ruby": "3.25.1" + "cpp": "4.25.2-dev", + "csharp": "3.25.2-dev", + "java": "3.25.2-dev", + "javascript": "3.25.2-dev", + "objectivec": "3.25.2-dev", + "php": "3.25.2-dev", + "python": "4.25.2-dev", + "ruby": "3.25.2-dev" } } }
\ No newline at end of file |