Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updating version.json and repo version numbers to: 21.0-rc1

Browse Source
pull/9944/head
Protobuf Team 3 years ago
parent bf5e800447
commit d259bd3287
40 changed files with 90 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Protobuf-C++.podspec
  2. 2
      Protobuf.podspec
  3. 2
      cmake/libprotobuf-lite.cmake
  4. 2
      cmake/libprotobuf.cmake
  5. 2
      cmake/libprotoc.cmake
  6. 2
      configure.ac
  7. 2
      csharp/Google.Protobuf.Tools.nuspec
  8. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  9. 6
      java/README.md
  10. 2
      java/bom/pom.xml
  11. 2
      java/core/pom.xml
  12. 2
      java/kotlin-lite/pom.xml
  13. 2
      java/kotlin/pom.xml
  14. 2
      java/lite.md
  15. 2
      java/lite/pom.xml
  16. 2
      java/pom.xml
  17. 2
      java/util/pom.xml
  18. 23
      php/ext/google/protobuf/package.xml
  19. 2
      php/ext/google/protobuf/protobuf.h
  20. 6
      protobuf_version.bzl
  21. 2
      protoc-artifacts/pom.xml
  22. 2
      python/google/protobuf/__init__.py
  23. 2
      ruby/google-protobuf.gemspec
  24. 4
      ruby/pom.xml
  25. 2
      src/Makefile.am
  26. 4
      src/google/protobuf/any.pb.h
  27. 4
      src/google/protobuf/api.pb.h
  28. 4
      src/google/protobuf/compiler/plugin.pb.h
  29. 4
      src/google/protobuf/descriptor.pb.h
  30. 4
      src/google/protobuf/duration.pb.h
  31. 4
      src/google/protobuf/empty.pb.h
  32. 4
      src/google/protobuf/field_mask.pb.h
  33. 8
      src/google/protobuf/port_def.inc
  34. 4
      src/google/protobuf/source_context.pb.h
  35. 4
      src/google/protobuf/struct.pb.h
  36. 8
      src/google/protobuf/stubs/common.h
  37. 4
      src/google/protobuf/timestamp.pb.h
  38. 4
      src/google/protobuf/type.pb.h
  39. 4
      src/google/protobuf/wrappers.pb.h
  40. 20
      version.json

2
Protobuf-C++.podspec
Unescape View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf-C++' s.name = 'Protobuf-C++'
s.version = '3.20.1' s.version = '3.21.0-rc1'
s.summary = 'Protocol Buffers v3 runtime library for C++.' s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf' s.homepage = 'https://github.com/google/protobuf'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'

2
Protobuf.podspec
Unescape View File

@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library. # dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf' s.name = 'Protobuf'
s.version = '3.20.1' s.version = '3.21.0-rc1'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf' s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'

2
cmake/libprotobuf-lite.cmake
Unescape View File

@ -115,7 +115,7 @@ if(protobuf_BUILD_SHARED_LIBS)
endif() endif()
set_target_properties(libprotobuf-lite PROPERTIES set_target_properties(libprotobuf-lite PROPERTIES
VERSION ${protobuf_VERSION} VERSION ${protobuf_VERSION}
SOVERSION 31 SOVERSION 32
OUTPUT_NAME ${LIB_PREFIX}protobuf-lite OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)

2
cmake/libprotobuf.cmake
Unescape View File

@ -131,7 +131,7 @@ if(protobuf_BUILD_SHARED_LIBS)
endif() endif()
set_target_properties(libprotobuf PROPERTIES set_target_properties(libprotobuf PROPERTIES
VERSION ${protobuf_VERSION} VERSION ${protobuf_VERSION}
SOVERSION 31 SOVERSION 32
OUTPUT_NAME ${LIB_PREFIX}protobuf OUTPUT_NAME ${LIB_PREFIX}protobuf
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf ALIAS libprotobuf) add_library(protobuf::libprotobuf ALIAS libprotobuf)

2
cmake/libprotoc.cmake
Unescape View File

@ -133,7 +133,7 @@ endif()
set_target_properties(libprotoc PROPERTIES set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
VERSION ${protobuf_VERSION} VERSION ${protobuf_VERSION}
SOVERSION 31 SOVERSION 32
OUTPUT_NAME ${LIB_PREFIX}protoc OUTPUT_NAME ${LIB_PREFIX}protoc
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotoc ALIAS libprotoc) add_library(protobuf::libprotoc ALIAS libprotoc)

2
configure.ac
Unescape View File

@ -17,7 +17,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release # In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.) # the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[3.20.1],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[21.0-rc-1],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])

2
csharp/Google.Protobuf.Tools.nuspec
Unescape View File

@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title> <title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description> <description>See project site for more info.</description>
<version>3.20.1</version> <version>3.21.0-rc1</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

2
csharp/src/Google.Protobuf/Google.Protobuf.csproj
Unescape View File

@ -4,7 +4,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright> <Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.20.1</VersionPrefix> <VersionPrefix>3.21.0-rc1</VersionPrefix>
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence --> <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
<LangVersion>7.2</LangVersion> <LangVersion>7.2</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>

6
java/README.md
Unescape View File

@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</dependency> </dependency>
``` ```
@ -37,7 +37,7 @@ protobuf-java-util package:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</dependency> </dependency>
``` ```
@ -45,7 +45,7 @@ protobuf-java-util package:
If you are using Gradle, add the following to your `build.gradle` file's dependencies: If you are using Gradle, add the following to your `build.gradle` file's dependencies:
``` ```
implementation 'com.google.protobuf:protobuf-java:3.20.1' implementation 'com.google.protobuf:protobuf-java:3.21.0-rc-1'
``` ```
Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.

2
java/bom/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId> <artifactId>protobuf-bom</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name> <name>Protocol Buffers [BOM]</name>

2
java/core/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</parent> </parent>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>

2
java/kotlin-lite/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</parent> </parent>
<artifactId>protobuf-kotlin-lite</artifactId> <artifactId>protobuf-kotlin-lite</artifactId>

2
java/kotlin/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</parent> </parent>
<artifactId>protobuf-kotlin</artifactId> <artifactId>protobuf-kotlin</artifactId>

2
java/lite.md
Unescape View File

@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</dependency> </dependency>
``` ```

2
java/lite/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</parent> </parent>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>

2
java/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name> <name>Protocol Buffers [Parent]</name>

2
java/util/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</parent> </parent>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>

23
php/ext/google/protobuf/package.xml
Unescape View File

@ -10,11 +10,11 @@
<email>protobuf-opensource@google.com</email> <email>protobuf-opensource@google.com</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2022-04-20</date> <date>2022-05-10</date>
<time>22:01:25</time> <time>11:33:40</time>
<version> <version>
<release>3.20.1</release> <release>3.21.0RC1</release>
<api>3.20.1</api> <api>3.21.0</api>
</version> </version>
<stability> <stability>
<release>beta</release> <release>beta</release>
@ -1283,5 +1283,20 @@ G A release.
<notes> <notes>
</notes> </notes>
</release> </release>
<release>
<version>
<release>3.21.0RC1</release>
<api>3.21.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2022-05-10</date>
<time>11:33:40</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
<notes>
</notes>
</release>
</changelog> </changelog>
</package> </package>

2
php/ext/google/protobuf/protobuf.h
Unescape View File

@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
#define PHP_PROTOBUF_VERSION "3.20.1" #define PHP_PROTOBUF_VERSION "3.21.0RC1"
// ptr -> PHP object cache. This is a weak map that caches lazily-created // ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types: // wrapper objects around upb types:

6
protobuf_version.bzl
Unescape View File

@ -1,3 +1,3 @@
PROTOC_VERSION = '3.20.1' PROTOC_VERSION = '21.0-rc-1'
PROTOBUF_JAVA_VERSION = '3.20.1' PROTOBUF_JAVA_VERSION = '3.21.0-rc-1'
PROTOBUF_PYTHON_VERSION = '3.20.1' PROTOBUF_PYTHON_VERSION = '4.21.0-rc-1'

2
protoc-artifacts/pom.xml
Unescape View File

@ -8,7 +8,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId> <artifactId>protoc</artifactId>
<version>3.20.1</version> <version>21.0-rc-1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protobuf Compiler</name> <name>Protobuf Compiler</name>
<description> <description>

2
python/google/protobuf/__init__.py
Unescape View File

@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved. # Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '3.20.1' __version__ = '4.21.0rc1'

2
ruby/google-protobuf.gemspec
Unescape View File

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.20.1" s.version = "3.21.0.rc.1"
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 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.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"

4
ruby/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId> <groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId> <artifactId>protobuf-jruby</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
<name>Protocol Buffer JRuby native extension</name> <name>Protocol Buffer JRuby native extension</name>
<description> <description>
Protocol Buffers are a way of encoding structured data in an efficient yet Protocol Buffers are a way of encoding structured data in an efficient yet
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.20.1</version> <version>3.21.0-rc-1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jruby</groupId> <groupId>org.jruby</groupId>

2
src/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ else
PTHREAD_DEF = PTHREAD_DEF =
endif endif
PROTOBUF_VERSION = 31:1:0 PROTOBUF_VERSION = 32:0:0
if GCC if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison # Turn on all warnings except for sign comparison (we ignore sign comparison

4
src/google/protobuf/any.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/api.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/duration.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/empty.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/field_mask.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

8
src/google/protobuf/port_def.inc
Unescape View File

@ -178,17 +178,17 @@
#ifdef PROTOBUF_VERSION #ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined #error PROTOBUF_VERSION was previously defined
#endif #endif
#define PROTOBUF_VERSION 3020001 #define PROTOBUF_VERSION 3021000
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
#endif #endif
#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3020000 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3021000
#ifdef PROTOBUF_MIN_PROTOC_VERSION #ifdef PROTOBUF_MIN_PROTOC_VERSION
#error PROTOBUF_MIN_PROTOC_VERSION was previously defined #error PROTOBUF_MIN_PROTOC_VERSION was previously defined
#endif #endif
#define PROTOBUF_MIN_PROTOC_VERSION 3020000 #define PROTOBUF_MIN_PROTOC_VERSION 3021000
#ifdef PROTOBUF_VERSION_SUFFIX #ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined #error PROTOBUF_VERSION_SUFFIX was previously defined
@ -385,7 +385,7 @@
// The minimum library version which works with the current version of the // The minimum library version which works with the current version of the
// headers. // headers.
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3020000 #define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3021000
#ifdef PROTOBUF_RTTI #ifdef PROTOBUF_RTTI
#error PROTOBUF_RTTI was previously defined #error PROTOBUF_RTTI was previously defined

4
src/google/protobuf/source_context.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/struct.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

8
src/google/protobuf/stubs/common.h
Unescape View File

@ -82,7 +82,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison // The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro // easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 3020001 #define GOOGLE_PROTOBUF_VERSION 3021000
// A suffix string for alpha, beta or rc releases. Empty for stable releases. // A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1" #define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1"
@ -90,15 +90,15 @@ namespace internal {
// The minimum header version which works with the current version of // The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code // the library. This constant should only be used by protoc's C++ code
// generator. // generator.
static const int kMinHeaderVersionForLibrary = 3020000; static const int kMinHeaderVersionForLibrary = 3021000;
// The minimum protoc version which works with the current version of the // The minimum protoc version which works with the current version of the
// headers. // headers.
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3020000 #define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3021000
// The minimum header version which works with the current version of // The minimum header version which works with the current version of
// protoc. This constant should only be used in VerifyVersion(). // protoc. This constant should only be used in VerifyVersion().
static const int kMinHeaderVersionForProtoc = 3020000; static const int kMinHeaderVersionForProtoc = 3021000;
// Verifies that the headers and libraries are compatible. Use the macro // Verifies that the headers and libraries are compatible. Use the macro
// below to call this. // below to call this.

4
src/google/protobuf/timestamp.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/type.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

4
src/google/protobuf/wrappers.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3020000 #if PROTOBUF_VERSION < 3021000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3020001 < PROTOBUF_MIN_PROTOC_VERSION #if 3021000 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

20
version.json
Unescape View File

@ -1,17 +1,17 @@
{ {
"main": { "21.x": {
"protoc_version": "22-dev", "protoc_version": "21.0-rc1",
"lts": false, "lts": false,
"date": "2022-05-10", "date": "2022-05-10",
"languages": { "languages": {
"cpp": "3.22-dev", "cpp": "3.21.0-rc1",
"csharp": "3.22-dev", "csharp": "3.21.0-rc1",
"java": "3.22-dev", "java": "3.21.0-rc1",
"javascript": "3.22-dev", "javascript": "3.21.0-rc1",
"objectivec": "3.22-dev", "objectivec": "3.21.0-rc1",
"php": "3.22-dev", "php": "3.21.0-rc1",
"python": "4.22-dev", "python": "4.21.0-rc1",
"ruby": "3.22-dev" "ruby": "3.21.0-rc1"
} }
} }
} }
Write Preview
Loading…
Cancel
Save