diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2023-11-01 15:46:53 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-01 15:46:53 -0700 |
commit | cfd4223b1e21346f6f12633693f049641d6c437f (patch) | |
tree | 798ea44f23899daed97e981a802621cec7aefef9 | |
parent | 59a66af1465c8abbc78c7506153ae7f711b991f2 (diff) | |
parent | 7203caaae76f7a0fef892ece10aeae90959794db (diff) | |
download | protobuf-cfd4223b1e21346f6f12633693f049641d6c437f.tar.gz |
Merge pull request #14596 from protocolbuffers/25.x-202311012212
25.x 202311012212
38 files changed, 54 insertions, 54 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 868674460..f78fccc27 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.0-rc-2") +set(protobuf_VERSION_STRING "4.25.0") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 4f7ce1f7e..f2b9f3553 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.0-rc2' + s.version = '4.25.0' 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 6852f2d26..0e4a664d6 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.0-rc2' + s.version = '3.25.0' 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 4cd5e4970..bd9a3b66d 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.0-rc2</version> + <version>3.25.0</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 1623bd1e2..b5731cdeb 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.0-rc2</VersionPrefix> + <VersionPrefix>3.25.0</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 acbdb0005..f6dab2654 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.0-rc-2</version> + <version>3.25.0</version> </dependency> ``` @@ -37,14 +37,14 @@ protobuf-java-util package: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.25.0-rc-2</version> + <version>3.25.0</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.0-rc-2'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.0'` 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 24a7ba1d4..411c501fa 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.0-RC2</version> + <version>3.25.0</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name> diff --git a/java/core/pom.xml b/java/core/pom.xml index 8942e32b5..c98d16879 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.0-RC2</version> + <version>3.25.0</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 0074e6f7f..bc4fb9ef7 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.0-RC2</version> + <version>3.25.0</version> </parent> <artifactId>protobuf-kotlin-lite</artifactId> diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index b7dd892c1..3d26d8a31 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.0-RC2</version> + <version>3.25.0</version> </parent> <artifactId>protobuf-kotlin</artifactId> diff --git a/java/lite.md b/java/lite.md index 910546619..fbaf1c8ed 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.0-rc-2</version> + <version>3.25.0</version> </dependency> ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 9d4ab79be..3f9e3897b 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.0-RC2</version> + <version>3.25.0</version> </parent> <artifactId>protobuf-javalite</artifactId> diff --git a/java/pom.xml b/java/pom.xml index 44dda5387..9e0a6992c 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.0-RC2</version> + <version>3.25.0</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index f3002179f..34f8579c8 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.0-RC2</version> + <version>3.25.0</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff --git a/java/util/pom.xml b/java/util/pom.xml index d374d425c..f25581be8 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.0-RC2</version> + <version>3.25.0</version> </parent> <artifactId>protobuf-java-util</artifactId> diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index ad138218b..4fab47f35 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.0RC2" +#define PHP_PROTOBUF_VERSION "3.25.0" // 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 ed03f1224..a122dc377 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.0-rc-2" -PROTOBUF_JAVA_VERSION = "3.25.0-RC2" -PROTOBUF_PYTHON_VERSION = "4.25.0rc2" -PROTOBUF_PHP_VERSION = "3.25.0RC2" -PROTOBUF_RUBY_VERSION = "3.25.0.rc.2" +PROTOC_VERSION = "25.0" +PROTOBUF_JAVA_VERSION = "3.25.0" +PROTOBUF_PYTHON_VERSION = "4.25.0" +PROTOBUF_PHP_VERSION = "3.25.0" +PROTOBUF_RUBY_VERSION = "3.25.0" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 09f7a3d8b..522b7ed49 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.0rc2' +__version__ = '4.25.0' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index ecfa8f97c..e3770be41 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.0.rc.2" + s.version = "3.25.0" 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 4f60d02c1..5cd8245c5 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.0-RC2</version> + <version>3.25.0</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.0-RC2</version> + <version>3.25.0</version> </dependency> <dependency> <groupId>org.jruby</groupId> diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 89cb01178..13968ac3a 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index a778c373b..f55e3599f 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 64297ead9..b0871acf9 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #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 diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 459abfcbe..574c17254 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/versions_suffix.h b/src/google/protobuf/compiler/versions_suffix.h index 0210cb7df..0c7a8d298 100644 --- a/src/google/protobuf/compiler/versions_suffix.h +++ b/src/google/protobuf/compiler/versions_suffix.h @@ -21,6 +21,6 @@ // // Please avoid changing it manually, as they should be updated automatically by // the Protobuf release process. -#define PROTOBUF_GENCODE_VERSION_SUFFIX "-rc2" +#define PROTOBUF_GENCODE_VERSION_SUFFIX "" #endif // GOOGLE_PROTOBUF_COMPILER_VERSIONS_SUFFIX_H__ diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 389823502..8407117a3 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 560e66c45..36220fdc9 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index a306db4f7..3ed09becb 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 91ef8c784..f0a618d8e 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index bb2ca7125..89c042c67 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index a89add591..4b1d2b46c 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -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 "-rc2" +#define PROTOBUF_VERSION_SUFFIX "" #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 066c0a45d..9d35f1b2d 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index e50cf53b3..ef2b036ff 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index cfd72f171..2a95199d5 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -47,7 +47,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 4025000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" // 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 0c513a27a..9a6579252 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 362165804..0ff5349da 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 224ccd5c4..b348b5d7c 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.0-rc2 +// Protobuf C++ Version: 4.25.0 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh diff --git a/version.json b/version.json index 4263fdcd3..ba0cf35f4 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "25.x": { - "protoc_version": "25.0-dev", + "protoc_version": "25.1-dev", "lts": false, - "date": "2023-10-18", + "date": "2023-11-01", "languages": { - "cpp": "4.25.0-dev", - "csharp": "3.25.0-dev", - "java": "3.25.0-dev", - "javascript": "3.25.0-dev", - "objectivec": "3.25.0-dev", - "php": "3.25.0-dev", - "python": "4.25.0-dev", - "ruby": "3.25.0-dev" + "cpp": "4.25.1-dev", + "csharp": "3.25.1-dev", + "java": "3.25.1-dev", + "javascript": "3.25.1-dev", + "objectivec": "3.25.1-dev", + "php": "3.25.1-dev", + "python": "4.25.1-dev", + "ruby": "3.25.1-dev" } } }
\ No newline at end of file |