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

Merge pull request #9136 from protocolbuffers/3.19.x

Browse Source 
Merge 3.19.x into master
pull/7217/head
Adam Cozzette 3 years ago committed by GitHub
parent 1e1c1cd884 67c2a92f82
commit e6430dd4a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 176 additions and 89 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. 35
      CHANGES.txt
  2. 2
      Makefile.am
  3. 2
      Protobuf-C++.podspec
  4. 2
      Protobuf.podspec
  5. 2
      configure.ac
  6. 2
      csharp/Google.Protobuf.Tools.nuspec
  7. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  8. 6
      java/README.md
  9. 2
      java/bom/pom.xml
  10. 2
      java/core/pom.xml
  11. 2
      java/kotlin-lite/pom.xml
  12. 2
      java/kotlin/pom.xml
  13. 2
      java/lite.md
  14. 2
      java/lite/pom.xml
  15. 2
      java/pom.xml
  16. 2
      java/util/pom.xml
  17. 2
      js/package.json
  18. 10
      kokoro/linux/bazel/build.sh
  19. 55
      php/ext/google/protobuf/package.xml
  20. 2
      php/ext/google/protobuf/protobuf.h
  21. 2
      protobuf_version.bzl
  22. 2
      protoc-artifacts/pom.xml
  23. 2
      python/google/protobuf/__init__.py
  24. 2
      ruby/google-protobuf.gemspec
  25. 4
      ruby/pom.xml
  26. 2
      src/Makefile.am
  27. 4
      src/google/protobuf/any.pb.h
  28. 4
      src/google/protobuf/api.pb.h
  29. 18
      src/google/protobuf/compiler/java/java_string_field.cc
  30. 2
      src/google/protobuf/compiler/java/java_string_field_lite.cc
  31. 4
      src/google/protobuf/compiler/plugin.pb.h
  32. 3
      src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
  33. 3
      src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
  34. 7
      src/google/protobuf/compiler/ruby/ruby_generator.cc
  35. 4
      src/google/protobuf/descriptor.pb.h
  36. 4
      src/google/protobuf/duration.pb.h
  37. 4
      src/google/protobuf/empty.pb.h
  38. 4
      src/google/protobuf/field_mask.pb.h
  39. 8
      src/google/protobuf/port_def.inc
  40. 4
      src/google/protobuf/source_context.pb.h
  41. 4
      src/google/protobuf/struct.pb.h
  42. 8
      src/google/protobuf/stubs/common.h
  43. 4
      src/google/protobuf/timestamp.pb.h
  44. 4
      src/google/protobuf/type.pb.h
  45. 4
      src/google/protobuf/wrappers.pb.h

35
CHANGES.txt
Unescape View File

@ -1,20 +1,47 @@
Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) 2021-10-15 version 3.19.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
Python
* Proto2 DecodeError now includes message name in error message
C++ C++
* Make proto2::Message::DiscardUnknownFields() non-virtual * Make proto2::Message::DiscardUnknownFields() non-virtual
* Separate RepeatedPtrField into its own header file * Separate RepeatedPtrField into its own header file
* For default floating point values of 0, consider all bits significant * For default floating point values of 0, consider all bits significant
* cmake: support `MSVC_RUNTIME_LIBRARY` property (#8851)
* Fix shadowing warnings (#8926)
* Fix for issue #8484, constant initialization doesn't compile in msvc clang-cl environment (#8993)
* Fix build on AIX and SunOS (#8373) (#9065)
* Add Android stlport and default toolchains to BUILD. (#8290)
Java Java
* For default floating point values of 0, consider all bits significant * For default floating point values of 0, consider all bits significant
* Annotate `//java/com/google/protobuf/util/...` with nullness annotations * Annotate `//java/com/google/protobuf/util/...` with nullness annotations
* Use ArrayList copy constructor (#7853)
Kotlin Kotlin
* Switch Kotlin proto DSLs to be implemented with inline value classes * Switch Kotlin proto DSLs to be implemented with inline value classes
Python
* Proto2 DecodeError now includes message name in error message
* Make MessageToDict convert map keys to strings (#8122)
* Add python-requires in setup.py (#8989)
* Add python 3.10 (#9034)
JavaScript
* Skip exports if not available by CommonJS (#8856)
* JS: Comply with CSP no-unsafe-eval. (#8864)
PHP
* Added "object" as a reserved name for PHP (#8962)
Ruby
* Override Map.clone to use Map's dup method (#7938)
* Ruby: build extensions for arm64-darwin (#8232)
* Add class method Timestamp.from_time to ruby well known types (#8562)
* Adopt pure ruby DSL implementation for JRuby (#9047)
* Add size to Map class (#8068)
C#
* Correctly set ExtensionRegistry when parsing with MessageParser, but using an already existing CodedInputStream (#7246)
* [C#] Make FieldDescriptor propertyName public (#7642)
2021-10-04 version 3.18.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) 2021-10-04 version 3.18.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
Python Python

2
Makefile.am
Unescape View File

@ -1424,8 +1424,10 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
examples/list_people.py \ examples/list_people.py \
examples/list_people_test.go \ examples/list_people_test.go \
examples/pubspec.yaml \ examples/pubspec.yaml \
maven_install.json \
protobuf.bzl \ protobuf.bzl \
protobuf_deps.bzl \ protobuf_deps.bzl \
protobuf_version.bzl \
third_party/zlib.BUILD \ third_party/zlib.BUILD \
util/python/BUILD \ util/python/BUILD \
internal.bzl internal.bzl

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.18.1' s.version = '3.19.0'
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 = '3-Clause BSD License' s.license = '3-Clause BSD License'

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.18.1' s.version = '3.19.0'
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 = '3-Clause BSD License' s.license = '3-Clause BSD License'

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.18.1],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[3.19.0],[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.18.1</version> <version>3.19.0</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/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.18.1</VersionPrefix> <VersionPrefix>3.19.0</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.18.0</version> <version>3.19.0</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.18.0</version> <version>3.19.0</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.18.0' implementation 'com.google.protobuf:protobuf-java:3.19.0'
``` ```
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.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</version>
</parent> </parent>
<artifactId>protobuf-kotlin</artifactId> <artifactId>protobuf-kotlin</artifactId>

2
java/lite.md
Unescape View File

@ -30,7 +30,7 @@ protobuf Java runtime. If you are using Maven, use the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
<version>3.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</version>
</parent> </parent>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>

2
js/package.json
Unescape View File

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

10
kokoro/linux/bazel/build.sh
Unescape View File

@ -35,5 +35,13 @@ bazel test -k --copt=-Werror --host_copt=-Werror \
@com_google_protobuf//:cc_proto_blacklist_test @com_google_protobuf//:cc_proto_blacklist_test
trap - EXIT trap - EXIT
cd examples pushd examples
bazel build //... bazel build //...
popd
# Verify that we can build successfully from generated tar files.
./autogen.sh && ./configure && make -j$(nproc) dist
DIST=`ls *.tar.gz`
tar -xf $DIST
cd ${DIST//.tar.gz}
bazel build //:protobuf //:protobuf_java

55
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>2021-10-04</date> <date>2021-10-19</date>
<time>13:03:51</time> <time>11:06:24</time>
<version> <version>
<release>3.18.1</release> <release>3.19.0</release>
<api>3.18.1</api> <api>3.19.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -22,7 +22,7 @@
</stability> </stability>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
* No new changes in 3.18.1 * Added &quot;object&quot; as a reserved name (#8962)
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="/" name="/"> <dir baseinstalldir="/" name="/">
@ -1098,5 +1098,50 @@ G A release.
<notes> <notes>
</notes> </notes>
</release> </release>
<release>
<version>
<release>3.19.0RC1</release>
<api>3.19.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2021-10-15</date>
<time>13:38:38</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
<release>
<version>
<release>3.19.0RC2</release>
<api>3.19.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2021-10-18</date>
<time>15:36:35</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
<release>
<version>
<release>3.19.0</release>
<api>3.19.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2021-10-19</date>
<time>11:06:24</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
</changelog> </changelog>
</package> </package>

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

@ -91,7 +91,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.18.1" #define PHP_PROTOBUF_VERSION "3.19.0"
// 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:

2
protobuf_version.bzl
Unescape View File

@ -1 +1 @@
PROTOBUF_VERSION = '3.18.1' PROTOBUF_VERSION = '3.19.0'

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.18.1</version> <version>3.19.0</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.18.1' __version__ = '3.19.0'

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.18.1" s.version = "3.19.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 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.18.1</version> <version>3.19.0</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.18.1</version> <version>3.19.0</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 = 28:3:0 PROTOBUF_VERSION = 30: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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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.

18
src/google/protobuf/compiler/java/java_string_field.cc
Unescape View File

@ -968,13 +968,11 @@ void RepeatedImmutableStringFieldGenerator::GenerateKotlinDslMembers(
// property for List<String> // property for List<String>
WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER); WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
printer->Print( printer->Print(variables_,
variables_, "$kt_deprecation$public val $kt_name$: "
"public val $kt_name$: "
"com.google.protobuf.kotlin.DslList" "com.google.protobuf.kotlin.DslList"
"<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n" "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n"
" @kotlin.OptIn" " @kotlin.jvm.JvmSynthetic\n"
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
" get() = com.google.protobuf.kotlin.DslList(\n" " get() = com.google.protobuf.kotlin.DslList(\n"
" $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n" " $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
" )\n"); " )\n");
@ -997,10 +995,11 @@ void RepeatedImmutableStringFieldGenerator::GenerateKotlinDslMembers(
printer->Print(variables_, printer->Print(variables_,
"@kotlin.jvm.JvmSynthetic\n" "@kotlin.jvm.JvmSynthetic\n"
"@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n" "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
"public operator fun com.google.protobuf.kotlin.DslList" "@Suppress(\"NOTHING_TO_INLINE\")\n"
"public inline operator fun com.google.protobuf.kotlin.DslList"
"<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>." "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
"plusAssign(value: kotlin.String) {\n" "plusAssign(value: kotlin.String) {\n"
" $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n" " add(value)\n"
"}\n"); "}\n");
// List<String>.addAll(Iterable<String>) // List<String>.addAll(Iterable<String>)
@ -1023,10 +1022,11 @@ void RepeatedImmutableStringFieldGenerator::GenerateKotlinDslMembers(
variables_, variables_,
"@kotlin.jvm.JvmSynthetic\n" "@kotlin.jvm.JvmSynthetic\n"
"@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n" "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
"public operator fun com.google.protobuf.kotlin.DslList" "@Suppress(\"NOTHING_TO_INLINE\")\n"
"public inline operator fun com.google.protobuf.kotlin.DslList"
"<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>." "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
"plusAssign(values: kotlin.collections.Iterable<kotlin.String>) {\n" "plusAssign(values: kotlin.collections.Iterable<kotlin.String>) {\n"
" $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n" " addAll(values)\n"
"}\n"); "}\n");
// List<String>[Int] = String // List<String>[Int] = String

2
src/google/protobuf/compiler/java/java_string_field_lite.cc
Unescape View File

@ -755,7 +755,7 @@ void RepeatedImmutableStringFieldLiteGenerator::GenerateKotlinDslMembers(
WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER); WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
printer->Print( printer->Print(
variables_, variables_,
"public val $kt_name$: " "$kt_deprecation$public val $kt_name$: "
"com.google.protobuf.kotlin.DslList" "com.google.protobuf.kotlin.DslList"
"<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n" "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n"
" @kotlin.OptIn" " @kotlin.OptIn"

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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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.

3
src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
Unescape View File

@ -1,9 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT! # Generated by the protocol buffer compiler. DO NOT EDIT!
# source: ruby_generated_code.proto # source: ruby_generated_code.proto
require 'ruby_generated_code_proto2_import_pb'
require 'google/protobuf' require 'google/protobuf'
require 'ruby_generated_code_proto2_import_pb'
Google::Protobuf::DescriptorPool.generated_pool.build do Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("ruby_generated_code.proto", :syntax => :proto3) do add_file("ruby_generated_code.proto", :syntax => :proto3) do
add_message "A.B.C.TestMessage" do add_message "A.B.C.TestMessage" do

3
src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
Unescape View File

@ -1,9 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT! # Generated by the protocol buffer compiler. DO NOT EDIT!
# source: ruby_generated_code_proto2.proto # source: ruby_generated_code_proto2.proto
require 'ruby_generated_code_proto2_import_pb'
require 'google/protobuf' require 'google/protobuf'
require 'ruby_generated_code_proto2_import_pb'
Google::Protobuf::DescriptorPool.generated_pool.build do Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("ruby_generated_code_proto2.proto", :syntax => :proto2) do add_file("ruby_generated_code_proto2.proto", :syntax => :proto2) do
add_message "A.B.C.TestMessage" do add_message "A.B.C.TestMessage" do

7
src/google/protobuf/compiler/ruby/ruby_generator.cc
Unescape View File

@ -467,8 +467,6 @@ void EndPackageModules(int levels, io::Printer* printer) {
bool GenerateDslDescriptor(const FileDescriptor* file, io::Printer* printer, bool GenerateDslDescriptor(const FileDescriptor* file, io::Printer* printer,
std::string* error) { std::string* error) {
printer->Print(
"require 'google/protobuf'\n\n");
printer->Print("Google::Protobuf::DescriptorPool.generated_pool.build do\n"); printer->Print("Google::Protobuf::DescriptorPool.generated_pool.build do\n");
printer->Indent(); printer->Indent();
printer->Print("add_file(\"$filename$\", :syntax => :$syntax$) do\n", printer->Print("add_file(\"$filename$\", :syntax => :$syntax$) do\n",
@ -509,9 +507,14 @@ bool GenerateFile(const FileDescriptor* file, io::Printer* printer,
"\n", "\n",
"filename", file->name()); "filename", file->name());
printer->Print("require 'google/protobuf'\n\n");
if (file->dependency_count() != 0) {
for (int i = 0; i < file->dependency_count(); i++) { for (int i = 0; i < file->dependency_count(); i++) {
printer->Print("require '$name$'\n", "name", GetRequireName(file->dependency(i)->name())); printer->Print("require '$name$'\n", "name", GetRequireName(file->dependency(i)->name()));
} }
printer->Print("\n");
}
// TODO: Remove this when ruby supports extensions for proto2 syntax. // TODO: Remove this when ruby supports extensions for proto2 syntax.
if (file->syntax() == FileDescriptor::SYNTAX_PROTO2 && if (file->syntax() == FileDescriptor::SYNTAX_PROTO2 &&

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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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

@ -153,17 +153,17 @@
#ifdef PROTOBUF_VERSION #ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined #error PROTOBUF_VERSION was previously defined
#endif #endif
#define PROTOBUF_VERSION 3018001 #define PROTOBUF_VERSION 3019000
#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 3018000 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3019000
#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 3018000 #define PROTOBUF_MIN_PROTOC_VERSION 3019000
#ifdef PROTOBUF_VERSION_SUFFIX #ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined #error PROTOBUF_VERSION_SUFFIX was previously defined
@ -356,7 +356,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 3018000 #define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3019000
#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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 3018001 #define GOOGLE_PROTOBUF_VERSION 3019000
// 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 "" #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
@ -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 = 3018000; static const int kMinHeaderVersionForLibrary = 3019000;
// 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 3018000 #define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3019000
// 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 = 3018000; static const int kMinHeaderVersionForProtoc = 3019000;
// 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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 < 3018000 #if PROTOBUF_VERSION < 3019000
#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 3018001 < PROTOBUF_MIN_PROTOC_VERSION #if 3019000 < 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.

Write Preview
Loading…
Cancel
Save