Update protobuf version

pull/8920/head
Bo Yang 3 years ago
parent dd2c3378ab
commit d8f55782b0
  1. 2
      Protobuf-C++.podspec
  2. 2
      Protobuf.podspec
  3. 2
      configure.ac
  4. 2
      csharp/Google.Protobuf.Tools.nuspec
  5. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. 2
      java/bom/pom.xml
  7. 2
      java/core/pom.xml
  8. 2
      java/kotlin-lite/pom.xml
  9. 2
      java/kotlin/pom.xml
  10. 2
      java/lite/pom.xml
  11. 2
      java/pom.xml
  12. 2
      java/util/pom.xml
  13. 2
      js/package.json
  14. 21
      php/ext/google/protobuf/package.xml
  15. 2
      php/ext/google/protobuf/protobuf.h
  16. 2
      protobuf_version.bzl
  17. 2
      protoc-artifacts/pom.xml
  18. 2
      python/google/protobuf/__init__.py
  19. 2
      ruby/google-protobuf.gemspec
  20. 2
      src/google/protobuf/port_def.inc
  21. 2
      src/google/protobuf/stubs/common.h

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

@ -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.18.0-rc1'
s.version = '3.18.0-rc2'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = '3-Clause BSD License'

@ -17,7 +17,7 @@ AC_PREREQ(2.59)
# 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
# the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[3.18.0-rc-1],[protobuf@googlegroups.com],[protobuf])
AC_INIT([Protocol Buffers],[3.18.0-rc-2],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])

@ -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.18.0-rc1</version>
<version>3.18.0-rc2</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

@ -4,7 +4,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.18.0-rc1</VersionPrefix>
<VersionPrefix>3.18.0-rc2</VersionPrefix>
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
<LangVersion>7.2</LangVersion>
<Authors>Google Inc.</Authors>

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
{
"name": "google-protobuf",
"version": "3.18.0-rc.1",
"version": "3.18.0-rc.2",
"description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js",
"files": [

@ -10,10 +10,10 @@
<email>protobuf-opensource@google.com</email>
<active>yes</active>
</lead>
<date>2021-08-18</date>
<time>15:23:47</time>
<date>2021-08-27</date>
<time>14:37:43</time>
<version>
<release>3.18.0RC1</release>
<release>3.18.0RC2</release>
<api>3.18.0</api>
</version>
<stability>
@ -1053,5 +1053,20 @@ G A release.
<notes>
</notes>
</release>
<release>
<version>
<release>3.18.0RC2</release>
<api>3.18.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2021-08-27</date>
<time>14:37:43</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
</changelog>
</package>

@ -81,7 +81,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.18.0RC1"
#define PHP_PROTOBUF_VERSION "3.18.0RC2"
// ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types:

@ -1 +1 @@
PROTOBUF_VERSION = '3.18.0-rc-1'
PROTOBUF_VERSION = '3.18.0-rc-2'

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

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

@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
s.version = "3.18.0.rc.1"
s.version = "3.18.0.rc.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"

@ -168,7 +168,7 @@
#ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined
#endif
#define PROTOBUF_VERSION_SUFFIX "-rc1"
#define PROTOBUF_VERSION_SUFFIX "-rc2"
#if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID)
#error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined

@ -85,7 +85,7 @@ namespace internal {
#define GOOGLE_PROTOBUF_VERSION 3018000
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1"
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2"
// The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code

Loading…
Cancel
Save