Commit Graph

8504 Commits

Author SHA1 Message Date
Joshua Haberman
ba3836703b Sync from Piper @368866736
PROTOBUF_SYNC_PIPER
2021-04-16 09:55:03 -07:00
Joshua Haberman
c5c33d29dd Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-16 09:55:03 -07:00
Joshua Haberman
6051341ab2
Merge pull request #8499 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-04-16 09:52:23 -07:00
Joshua Haberman
1dcea0f02d Fixed sort ordering and updated test to output context information. 2021-04-16 08:10:49 -07:00
Joshua Haberman
64a7d647f9 Added new/missing file to Bazel BUILD. 2021-04-15 16:58:16 -07:00
Joshua Haberman
d59750622c Updated CHANGES.txt. 2021-04-15 16:22:09 -07:00
Joshua Haberman
0d07c2564b Ported C++ parse function generator to new enum names. 2021-04-15 16:09:17 -07:00
Joshua Haberman
e8cb1b8da2 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	src/google/protobuf/compiler/cpp/cpp_helpers.cc
#	src/google/protobuf/port_def.inc
2021-04-15 16:03:26 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211
PROTOBUF_SYNC_PIPER
2021-04-15 15:53:17 -07:00
Yuriy Chernyshov
2714bf0f5d
Undef DELETE macro on Windows (#8497) 2021-04-15 14:30:39 -07:00
Yuriy Chernyshov
568fd626f9
Use C++11 enum class for Utf8CheckMode (#8490)
* Use C++11 enum class for Utf8CheckMode

* Switch to k-prefixed enum members
2021-04-15 13:19:29 -07:00
Deanna Garcia
f6508077db Adding note to the README about kotlin protos 2021-04-15 16:39:18 +00:00
Kanro
3f5fc4df1d
Add intelliJ protobuf plugin and sisyphus (#8482) 2021-04-14 15:01:46 -07:00
Matt Fowles Kulukundis
d7deb5e36f
Merge pull request #8496 from olejniczak/master
#8492 constexpr defaulted default constructor of WrappedMutex
2021-04-14 16:39:23 -04:00
Przemyslaw Olejniczak
1a371f628c constexpr defaulted default constructor of WrappedMutex causes compile errors #8492 2021-04-14 17:26:32 +02:00
Jan Tattermusch
c3ce10e49c use multiarch/qemu-user-static docker image for registering qemu 2021-04-14 15:45:01 +02:00
Jan Tattermusch
5d9a5b4118 fix incorrectly copypasted comment 2021-04-13 15:01:51 +02:00
Jan Tattermusch
c8239319e1 add cfg for python aarch64 tests 2021-04-13 14:25:55 +02:00
Jan Tattermusch
b4531870b4 add prepare_qemu.sh script 2021-04-13 14:25:55 +02:00
Jan Tattermusch
a0b1b70819 fixups in python_crosscompile_aarch64.sh
add --host=aarch64 to ./configure invocation
use protoc_qemu_wrapper.sh
2021-04-13 14:25:55 +02:00
Jan Tattermusch
6aa19d9145 be clever about docker "-it" args 2021-04-13 14:25:55 +02:00
Jan Tattermusch
64d0b2940d add C++ aarch64 kokoro configuration 2021-04-13 13:52:00 +02:00
Jan Tattermusch
b3d497f6a5 run basic C++ tests under qemu emulator 2021-04-13 13:52:00 +02:00
Deanna Garcia
1c81c89b93 Add the codespell file to list of files not checked by codespell 2021-04-12 22:56:18 +00:00
Deanna Garcia
1b637aad33 Merge branch 'kotlinProtos' of https://github.com/deannagarcia/protobuf into kotlinProtos 2021-04-12 22:28:06 +00:00
Deanna Garcia
a250d3f8d8 Restrict extension setter and getter operations to non-nullable T 2021-04-12 22:25:20 +00:00
James D
68cb69ea68
Fix source gem compilation (#8471)
* Select appropriate protoc binary for gem build

This should allow gem installation when
`bundle config force_ruby_platform true` has been set.

It has the unfortunate side effect of printing the protoc version during
build, but a quiet cross-platform solution is more complicated.

* Add path to wyhash header for source gem compilation
2021-04-12 10:06:44 -07:00
Jensaarai
76e3ffd9f0 C#: Add ParseFrom/MergeFrom ReadOnlySpan<byte>
Address #7885
2021-04-09 19:36:32 -07:00
Dor
ee04809540
Use a newer version of rules_proto, with the new rule proto_descriptor_set (#8469) 2021-04-09 11:12:25 -07:00
Adam Cozzette
017599b450
Merge pull request #8470 from acozzette/merge-3-15-x
Merge 3.15.x into master
2021-04-08 13:24:32 -07:00
Adam Cozzette
5679811239 Merge branch '3.15.x' into merge-3-15-x 2021-04-08 10:54:02 -07:00
Matt Fowles Kulukundis
049e05f052
Merge pull request #8467 from SR-Lut3t1um/patch-1
[documentation] [java] Fixed version for gradle in java Readme.md
2021-04-08 09:26:57 -04:00
Tobias Liese
1db2b662de
Fixed version for gradle in java Readme.md
Looks like this was forgotten by the last time this was edited.
2021-04-08 10:48:22 +02:00
Adam Cozzette
e8b78f8208
Fixed memory leak of Ruby arena objects. (#8465)
In our free() method, we were freeing the memory from the
upb arena but we were failing to free the memory for the
Ruby arena object. This was causing every Ruby arena object
to leak: even though the objects were getting GC'd, the
underlying memory was not getting released.

Co-authored-by: Joshua Haberman <jhaberman@gmail.com>
2021-04-07 16:46:18 -07:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 (#8463)
* Update protobuf version

* Updated CHANGES.txt and package.xml for 3.15.8
2021-04-07 15:38:38 -07:00
Matt Fowles Kulukundis
c2148566c7
Merge pull request #8327 from alkasm/alkasm/method-desc-copy-to-proto
[python-runtime] Add MethodDescriptor.CopyToProto()
2021-04-07 16:02:22 -04:00
Joshua Haberman
1ed9a8b521
Merge pull request #8461 from haberman/ruby-arena-memory-leak
Fixed memory leak of Ruby arena objects.
2021-04-07 11:25:42 -07:00
Joshua Haberman
67fee915e0 Fixed memory leak of Ruby arena objects.
In our free() method, we were freeing the memory from the
upb arena but we were failing to free the memory for the
Ruby arena object. This was causing every Ruby arena object
to leak: even though the objects were getting GC'd, the
underlying memory was not getting released.
2021-04-07 10:30:51 -07:00
Alexander Reynolds
3c782fc3d6 Remove py impl skip for method desc CopyToProto test 2021-04-07 02:21:46 -07:00
Adam Cozzette
7689f00ba8
Update protobuf version (#8448) 2021-04-06 14:26:56 -07:00
Adam Cozzette
6099c6505d
Updated CHANGES.txt for 3.16.0 (#8456)
* Updated CHANGES.txt for 3.16.0

* Fix spelling errors
2021-04-06 13:23:26 -07:00
deannagarcia
e844a53716
Merge branch 'master' into kotlinProtos 2021-04-06 10:18:13 -07:00
Chris Rebert
9d175493a3 addressbook.proto: Enable java_multiple_files option
And update the java_package value accordingly.
Enabling java_multiple_files is preferred nowadays.
Refs CL 348101638 which updates the tutorial accordingly.
2021-04-06 10:07:52 -07:00
Jan Tattermusch
053966b495
Emulated python aarch64 tests (#8392)
This runs basic python aarch64 tests under qemu emulator, but uses artifacts that can be cross-built by a host compiler.
2021-04-05 14:12:54 -07:00
Lukas Fittl
93c703e816 Add test for json_name functionality 2021-04-03 18:42:54 -07:00
Lukas Fittl
07f263c7ef Address review feedback 2021-04-03 18:42:43 -07:00
Adam Cozzette
c9343864a2
Merge pull request #8447 from acozzette/merge-3-15-x
Merge 3.15.x into the master branch
2021-04-02 15:51:34 -07:00
Adam Cozzette
600799912a Revert "[C++] Refactor uint128 (#8416)"
This reverts commit b604419d26.
2021-04-02 15:49:06 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
Deanna Garcia
50592a51ab Making dependency on java proto instead of copying files and generating kotlin generated code for standard protos 2021-04-02 21:45:41 +00:00