Skip to content

Commit a001250

Browse files
deannagarciadeannagarcia
committed
Sync from Piper @353127564
PROTOBUF_SYNC_PIPER
2 parents 5c028d6 + 468bc19 commit a001250

File tree

277 files changed

+20678
-28985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+20678
-28985
lines changed

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
with:
1414
check_filenames: true
1515
skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal
16-
ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od"
16+
ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od"

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ conformance/*.class
137137

138138
# php test output
139139
composer.lock
140+
php/.phpunit.result.cache
140141
php/tests/.phpunit.result.cache
141142
php/tests/generated/
142143
php/tests/old_protoc
@@ -162,6 +163,7 @@ php/ext/google/protobuf/configure.ac
162163
php/ext/google/protobuf/configure.in
163164
php/ext/google/protobuf/mkinstalldirs
164165
php/ext/google/protobuf/run-tests.php
166+
php/ext/google/protobuf/third_party/
165167
vendor/
166168

167169
# JavaScript artifacts
@@ -190,6 +192,7 @@ ruby/tests/generated_code_pb.rb
190192
ruby/tests/test_import_pb.rb
191193
ruby/tests/test_ruby_package_pb.rb
192194
ruby/tests/generated_code_proto2_pb.rb
195+
ruby/tests/multi_level_nesting_test_pb.rb
193196
ruby/tests/test_import_proto2_pb.rb
194197
ruby/tests/test_ruby_package_proto2_pb.rb
195198
ruby/Gemfile.lock

‎CHANGES.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
2+
3+
C++
4+
* MessageDifferencer: fixed bug when using custom ignore with multiple
5+
unknown fields
6+
* Use init_seg in MSVC to push initialization to an earlier phase.
7+
* Runtime no longer triggers -Wsign-compare warnings.
8+
* Fixed -Wtautological-constant-out-of-range-compare warning.
9+
* DynamicCastToGenerated works for nullptr input for even if RTTI is disabled
10+
* Arena is refactored and optimized.
11+
* Clarified/specified that the exact value of Arena::SpaceAllocated() is an
12+
implementation detail users must not rely on. It should not be used in
13+
unit tests.
14+
* Change the signature of Any::PackFrom() to return false on error.
15+
16+
Java
17+
* Avoid possible UnsupportedOperationException when using CodedInputSteam
18+
with a direct ByteBuffer.
19+
* Make Durations.comparator() and Timestamps.comparator() Serializable.
20+
* Add more detailed error information for dynamic message field type
21+
validation failure
22+
23+
Python
24+
* Provided an override for the reverse() method that will reverse the internal
25+
collection directly instead of using the other methods of the BaseContainer.
26+
127
2020-11-11 version 3.14.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
228

329
Protocol Compiler

‎Makefile.am‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ csharp_EXTRA_DIST= \
8989
csharp/src/Google.Protobuf.Benchmarks/BenchmarkDatasetConfig.cs \
9090
csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs \
9191
csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs \
92+
csharp/src/Google.Protobuf.Benchmarks/ByteStringBenchmark.cs \
9293
csharp/src/Google.Protobuf.Benchmarks/Google.Protobuf.Benchmarks.csproj \
9394
csharp/src/Google.Protobuf.Benchmarks/GoogleMessageBenchmark.cs \
9495
csharp/src/Google.Protobuf.Benchmarks/ParseMessagesBenchmark.cs \
@@ -171,6 +172,7 @@ csharp_EXTRA_DIST= \
171172
csharp/src/Google.Protobuf.sln \
172173
csharp/src/Google.Protobuf/ByteArray.cs \
173174
csharp/src/Google.Protobuf/ByteString.cs \
175+
csharp/src/Google.Protobuf/ByteStringAsync.cs \
174176
csharp/src/Google.Protobuf/CodedInputStream.cs \
175177
csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs \
176178
csharp/src/Google.Protobuf/CodedOutputStream.cs \
@@ -268,7 +270,8 @@ csharp_EXTRA_DIST= \
268270
csharp/src/Google.Protobuf/WriteContext.cs \
269271
csharp/src/Google.Protobuf/WriteBufferHelper.cs \
270272
csharp/src/Google.Protobuf/UnknownField.cs \
271-
csharp/src/Google.Protobuf/UnknownFieldSet.cs
273+
csharp/src/Google.Protobuf/UnknownFieldSet.cs \
274+
csharp/src/Google.Protobuf/UnsafeByteOperations.cs
272275

273276
java_EXTRA_DIST= \
274277
java/README.md \
@@ -772,13 +775,11 @@ php_EXTRA_DIST= \
772775
php/ext/google/protobuf/arena.h \
773776
php/ext/google/protobuf/array.c \
774777
php/ext/google/protobuf/array.h \
775-
php/ext/google/protobuf/bundled_php.h \
776778
php/ext/google/protobuf/config.m4 \
777779
php/ext/google/protobuf/convert.c \
778780
php/ext/google/protobuf/convert.h \
779781
php/ext/google/protobuf/def.c \
780782
php/ext/google/protobuf/def.h \
781-
php/ext/google/protobuf/make-preload.php \
782783
php/ext/google/protobuf/map.c \
783784
php/ext/google/protobuf/map.h \
784785
php/ext/google/protobuf/message.c \
@@ -790,8 +791,10 @@ php_EXTRA_DIST= \
790791
php/ext/google/protobuf/php-upb.h \
791792
php/ext/google/protobuf/protobuf.c \
792793
php/ext/google/protobuf/protobuf.h \
794+
php/ext/google/protobuf/wkt.inc \
793795
php/generate_descriptor_protos.sh \
794796
php/phpunit.xml \
797+
php/prepare_c_extension.sh \
795798
php/release.sh \
796799
php/src/GPBMetadata/Google/Protobuf/Any.php \
797800
php/src/GPBMetadata/Google/Protobuf/Api.php \
@@ -827,6 +830,7 @@ php_EXTRA_DIST= \
827830
php/src/Google/Protobuf/GPBEmpty.php \
828831
php/src/Google/Protobuf/Int32Value.php \
829832
php/src/Google/Protobuf/Int64Value.php \
833+
php/src/Google/Protobuf/Internal/AnyBase.php \
830834
php/src/Google/Protobuf/Internal/CodedInputStream.php \
831835
php/src/Google/Protobuf/Internal/CodedOutputStream.php \
832836
php/src/Google/Protobuf/Internal/Descriptor.php \
@@ -886,6 +890,7 @@ php_EXTRA_DIST= \
886890
php/src/Google/Protobuf/Internal/ServiceOptions.php \
887891
php/src/Google/Protobuf/Internal/SourceCodeInfo.php \
888892
php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php \
893+
php/src/Google/Protobuf/Internal/TimestampBase.php \
889894
php/src/Google/Protobuf/Internal/UninterpretedOption.php \
890895
php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php \
891896
php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php \
@@ -1110,13 +1115,15 @@ ruby_EXTRA_DIST= \
11101115
ruby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java \
11111116
ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java \
11121117
ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java \
1118+
ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java \
11131119
ruby/src/main/java/com/google/protobuf/jruby/RubyEnumBuilderContext.java \
11141120
ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java \
1115-
ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java \
11161121
ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java \
1122+
ruby/src/main/java/com/google/protobuf/jruby/RubyFileBuilderContext.java \
1123+
ruby/src/main/java/com/google/protobuf/jruby/RubyFileDescriptor.java \
11171124
ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java \
1118-
ruby/src/main/java/com/google/protobuf/jruby/RubyMessageBuilderContext.java \
11191125
ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java \
1126+
ruby/src/main/java/com/google/protobuf/jruby/RubyMessageBuilderContext.java \
11201127
ruby/src/main/java/com/google/protobuf/jruby/RubyOneofBuilderContext.java \
11211128
ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java \
11221129
ruby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java \
@@ -1390,6 +1397,8 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
13901397
python/release/wheel/README.md \
13911398
third_party/six.BUILD \
13921399
third_party/zlib.BUILD \
1400+
third_party/wyhash/LICENSE \
1401+
third_party/wyhash/wyhash.h \
13931402
util/python/BUILD
13941403

13951404

‎Protobuf-C++.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Protobuf-C++'
3-
s.version = '3.13.0'
3+
s.version = '3.14.0'
44
s.summary = 'Protocol Buffers v3 runtime library for C++.'
55
s.homepage = 'https://github.com/google/protobuf'
66
s.license = '3-Clause BSD License'

0 commit comments

Comments
 (0)