Skip to content
Permalink
Browse files

Update protobuf version (#6898)

  • Loading branch information
rafi-kamal committed Nov 16, 2019
1 parent 4e93585 commit 3cc55d6167e086aef90710874d8de4ca68197f2f
Showing with 120 additions and 106 deletions.
  1. +1 −1 Protobuf-C++.podspec
  2. +1 −1 Protobuf.podspec
  3. +1 −1 configure.ac
  4. +1 −1 csharp/Google.Protobuf.Tools.nuspec
  5. +1 −1 csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. +1 −1 java/bom/pom.xml
  7. +1 −1 java/core/pom.xml
  8. +1 −1 java/lite/pom.xml
  9. +1 −1 java/pom.xml
  10. +1 −1 java/util/pom.xml
  11. +1 −1 js/package.json
  12. +17 −3 php/ext/google/protobuf/package.xml
  13. +1 −1 php/ext/google/protobuf/protobuf.h
  14. +2 −2 php/src/Google/Protobuf/Internal/DescriptorProto.php
  15. +3 −3 php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
  16. +2 −2 php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
  17. +2 −2 php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
  18. +2 −2 php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
  19. +2 −2 php/src/Google/Protobuf/Internal/EnumOptions.php
  20. +3 −3 php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
  21. +1 −1 php/src/Google/Protobuf/Internal/EnumValueOptions.php
  22. +10 −10 php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
  23. +6 −6 php/src/Google/Protobuf/Internal/FieldOptions.php
  24. +5 −5 php/src/Google/Protobuf/Internal/FileDescriptorProto.php
  25. +20 −20 php/src/Google/Protobuf/Internal/FileOptions.php
  26. +3 −3 php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
  27. +4 −4 php/src/Google/Protobuf/Internal/MessageOptions.php
  28. +6 −6 php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
  29. +2 −2 php/src/Google/Protobuf/Internal/MethodOptions.php
  30. +2 −2 php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
  31. +2 −2 php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
  32. +1 −1 php/src/Google/Protobuf/Internal/ServiceOptions.php
  33. +2 −2 php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
  34. +6 −6 php/src/Google/Protobuf/Internal/UninterpretedOption.php
  35. +2 −2 php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
  36. +1 −1 protoc-artifacts/pom.xml
  37. +1 −1 python/google/protobuf/__init__.py
  38. +1 −1 ruby/google-protobuf.gemspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
s.version = '3.11.0-rc0'
s.version = '3.11.0-rc1'
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.11.0-rc0'
s.version = '3.11.0-rc1'
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.11.0-rc-0],[protobuf@googlegroups.com],[protobuf])
AC_INIT([Protocol Buffers],[3.11.0-rc-1],[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.11.0-rc0</version>
<version>3.11.0-rc1</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.11.0-rc0</VersionPrefix>
<VersionPrefix>3.11.0-rc1</VersionPrefix>
<LangVersion>6</LangVersion>
<Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
@@ -4,7 +4,7 @@

<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>3.11.0-rc-0</version>
<version>3.11.0-rc-1</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.11.0-rc-0</version>
<version>3.11.0-rc-1</version>
</parent>

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

<artifactId>protobuf-javalite</artifactId>
@@ -4,7 +4,7 @@

<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.11.0-rc-0</version>
<version>3.11.0-rc-1</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.11.0-rc-0</version>
<version>3.11.0-rc-1</version>
</parent>

<artifactId>protobuf-java-util</artifactId>
@@ -1,6 +1,6 @@
{
"name": "google-protobuf",
"version": "3.11.0-rc.0",
"version": "3.11.0-rc.1",
"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>2019-10-03</date>
<time>14:24:03</time>
<date>2019-11-15</date>
<time>11:44:18</time>
<version>
<release>3.11.0RC0</release>
<release>3.11.0RC1</release>
<api>3.11.0</api>
</version>
<stability>
@@ -431,5 +431,19 @@ G A release.
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>GA release.</notes>
</release>
<release>
<version>
<release>3.11.0RC1</release>
<api>3.11.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2019-11-15</date>
<time>11:44:18</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>GA release.</notes>
</release>
</changelog>
</package>
@@ -37,7 +37,7 @@
#include "upb.h"

#define PHP_PROTOBUF_EXTNAME "protobuf"
#define PHP_PROTOBUF_VERSION "3.11.0RC0"
#define PHP_PROTOBUF_VERSION "3.11.0RC1"

#define MAX_LENGTH_OF_INT64 20
#define SIZEOF_INT64 8
@@ -20,7 +20,7 @@ class DescriptorProto extends \Google\Protobuf\Internal\Message
/**
* Generated from protobuf field <code>optional string name = 1;</code>
*/
private $name = '';
protected $name = '';
private $has_name = false;
/**
* Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto field = 2;</code>
@@ -55,7 +55,7 @@ class DescriptorProto extends \Google\Protobuf\Internal\Message
/**
* Generated from protobuf field <code>optional .google.protobuf.MessageOptions options = 7;</code>
*/
private $options = null;
protected $options = null;
private $has_options = false;
/**
* Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;</code>
@@ -20,19 +20,19 @@ class ExtensionRange extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional int32 start = 1;</code>
*/
private $start = 0;
protected $start = 0;
private $has_start = false;
/**
* Exclusive.
*
* Generated from protobuf field <code>optional int32 end = 2;</code>
*/
private $end = 0;
protected $end = 0;
private $has_end = false;
/**
* Generated from protobuf field <code>optional .google.protobuf.ExtensionRangeOptions options = 3;</code>
*/
private $options = null;
protected $options = null;
private $has_options = false;
/**
@@ -24,14 +24,14 @@ class ReservedRange extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional int32 start = 1;</code>
*/
private $start = 0;
protected $start = 0;
private $has_start = false;
/**
* Exclusive.
*
* Generated from protobuf field <code>optional int32 end = 2;</code>
*/
private $end = 0;
protected $end = 0;
private $has_end = false;
/**
@@ -20,7 +20,7 @@ class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
/**
* Generated from protobuf field <code>optional string name = 1;</code>
*/
private $name = '';
protected $name = '';
private $has_name = false;
/**
* Generated from protobuf field <code>repeated .google.protobuf.EnumValueDescriptorProto value = 2;</code>
@@ -30,7 +30,7 @@ class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
/**
* Generated from protobuf field <code>optional .google.protobuf.EnumOptions options = 3;</code>
*/
private $options = null;
protected $options = null;
private $has_options = false;
/**
* Range of reserved numeric values. Reserved numeric values may not be used
@@ -26,14 +26,14 @@ class EnumReservedRange extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional int32 start = 1;</code>
*/
private $start = 0;
protected $start = 0;
private $has_start = false;
/**
* Inclusive.
*
* Generated from protobuf field <code>optional int32 end = 2;</code>
*/
private $end = 0;
protected $end = 0;
private $has_end = false;
/**
@@ -21,7 +21,7 @@ class EnumOptions extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional bool allow_alias = 2;</code>
*/
private $allow_alias = false;
protected $allow_alias = false;
private $has_allow_alias = false;
/**
* Is this enum deprecated?
@@ -31,7 +31,7 @@ class EnumOptions extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
*/
private $deprecated = false;
protected $deprecated = false;
private $has_deprecated = false;
/**
* The parser stores options it doesn't recognize here. See above.
@@ -20,17 +20,17 @@ class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
/**
* Generated from protobuf field <code>optional string name = 1;</code>
*/
private $name = '';
protected $name = '';
private $has_name = false;
/**
* Generated from protobuf field <code>optional int32 number = 2;</code>
*/
private $number = 0;
protected $number = 0;
private $has_number = false;
/**
* Generated from protobuf field <code>optional .google.protobuf.EnumValueOptions options = 3;</code>
*/
private $options = null;
protected $options = null;
private $has_options = false;
/**
@@ -23,7 +23,7 @@ class EnumValueOptions extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional bool deprecated = 1 [default = false];</code>
*/
private $deprecated = false;
protected $deprecated = false;
private $has_deprecated = false;
/**
* The parser stores options it doesn't recognize here. See above.
@@ -20,25 +20,25 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
/**
* Generated from protobuf field <code>optional string name = 1;</code>
*/
private $name = '';
protected $name = '';
private $has_name = false;
/**
* Generated from protobuf field <code>optional int32 number = 3;</code>
*/
private $number = 0;
protected $number = 0;
private $has_number = false;
/**
* Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Label label = 4;</code>
*/
private $label = 0;
protected $label = 0;
private $has_label = false;
/**
* If type_name is set, this need not be set. If both this and type_name
* are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
*
* Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Type type = 5;</code>
*/
private $type = 0;
protected $type = 0;
private $has_type = false;
/**
* For message and enum types, this is the name of the type. If the name
@@ -49,15 +49,15 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional string type_name = 6;</code>
*/
private $type_name = '';
protected $type_name = '';
private $has_type_name = false;
/**
* For extensions, this is the name of the type being extended. It is
* resolved in the same manner as type_name.
*
* Generated from protobuf field <code>optional string extendee = 2;</code>
*/
private $extendee = '';
protected $extendee = '';
private $has_extendee = false;
/**
* For numeric types, contains the original text representation of the value.
@@ -68,15 +68,15 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional string default_value = 7;</code>
*/
private $default_value = '';
protected $default_value = '';
private $has_default_value = false;
/**
* If set, gives the index of a oneof in the containing type's oneof_decl
* list. This field is a member of that oneof.
*
* Generated from protobuf field <code>optional int32 oneof_index = 9;</code>
*/
private $oneof_index = 0;
protected $oneof_index = 0;
private $has_oneof_index = false;
/**
* JSON name of this field. The value is set by protocol compiler. If the
@@ -86,12 +86,12 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>optional string json_name = 10;</code>
*/
private $json_name = '';
protected $json_name = '';
private $has_json_name = false;
/**
* Generated from protobuf field <code>optional .google.protobuf.FieldOptions options = 8;</code>
*/
private $options = null;
protected $options = null;
private $has_options = false;
/**

0 comments on commit 3cc55d6

Please sign in to comment.
You can’t perform that action at this time.