AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
9,089 Commits 35 Branches 138 Tags 124 MiB
951582e893
Commit Graph

9089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David L. Jones
951582e893 Update changelog 2022-02-18 14:07:43 -08:00
David L. Jones
7ba5fa3d96 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-02-18 14:02:13 -08:00
David L. Jones
3ab97ce830 Sync from Piper @429642851 
PROTOBUF_SYNC_PIPER
 2022-02-18 14:02:12 -08:00
Jorg Brown
763d85293d
Merge pull request #9525 from dlj-NaN/sync-stage 
Integrate from Piper for C++, Java, and Python
 2022-02-18 12:15:58 -08:00
deannagarcia
ddfc233f57
Merge pull request #9524 from protocolbuffers/sysroot 
Change sysroot flags
 2022-02-18 11:02:52 -08:00
David L. Jones
20c5b6fd14 Update changelog 2022-02-17 18:01:44 -08:00
David L. Jones
2fbda76fad Sync from Piper @429445371 
PROTOBUF_SYNC_PIPER
 2022-02-17 18:00:38 -08:00
Deanna Garcia
cf05c9f84f Change sysroot flags 2022-02-18 00:39:23 +00:00
Jorg Brown
2f7ee91e32
Merge pull request #9522 from dlj-NaN/sync-stage 
Integrate from Piper for C++, Java, and Python
 2022-02-17 11:38:09 -08:00
David L. Jones
a6c9a5f69d Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	src/google/protobuf/compiler/java/java_message.cc
#	src/google/protobuf/compiler/java/java_message_lite.cc
 2022-02-17 09:54:12 -08:00
David L. Jones
1ba1d73e0d Sync from Piper @429333699 
PROTOBUF_SYNC_PIPER
 2022-02-17 09:53:51 -08:00
deannagarcia
972b122a30
Merge pull request #9518 from alexvanyo/patch-1 
Add test scope to kotlin-test for protobuf-kotlin-lite
 2022-02-17 09:24:03 -08:00
Alex Vanyo
97d78281de
Add test scope to kotlin-test for protobuf-kotlin-lite 2022-02-16 23:25:12 -06:00
Joshua Haberman
b0bf163c78
Merge pull request #9510 from haberman/manylinux-aarch64 
Changes to build aarch64 under manylinux.
 2022-02-16 10:02:47 -08:00
Joshua Haberman
9d01899322 Changes to build aarch64 under manylinux. 2022-02-15 18:02:10 -08:00
deannagarcia
8bfa7d0083
Merge pull request #9508 from protocolbuffers/genProtoRule 
Use internal kotlin gen rule
 2022-02-15 16:05:21 -08:00
Deanna Garcia
0f253ca64f Remove deleted files from Makefile 2022-02-15 23:03:12 +00:00
Deanna Garcia
67b74dd169 Use internal kotlin gen rule 2022-02-15 22:45:56 +00:00
idodod
2a2a9b6e64
Update third_party.md (#9505) 2022-02-15 07:22:53 -08:00
deannagarcia
479500a091
Merge pull request #9496 from protocolbuffers/duplicates 
Remove Proto3LiteTest.kt
 2022-02-14 10:45:02 -08:00
deannagarcia
9eb5b19964
Merge pull request #9494 from protocolbuffers/ktExport 
Fixing Kotlin tests
 2022-02-14 10:44:16 -08:00
Adam Cozzette
250fafa7c4
Fix the benchmark job and delete old Python configs (#9497) 
Our benchmark job starting failing when we stopped supporting Python 3.5
and 3.6, but this change fixes it by running it in our java_stretch
Docker container, which has a more recent Python version. I also deleted
all configs related to old Python versions that we no longer support.
 2022-02-11 16:25:56 -08:00
ObsidianMinor
013e115231
Add an option to preserve proto names in JsonFormatter (#6307) 
Co-authored-by: Adam Cozzette <acozzette@google.com>
 2022-02-11 15:55:46 -08:00
Deanna Garcia
79848b5f4c Update Makefile 2022-02-11 23:41:41 +00:00
Deanna Garcia
14c62a025c Removing Proto3LiteTest 2022-02-11 23:15:08 +00:00
Deanna Garcia
f1085e9bbc Remove old import 2022-02-11 22:26:07 +00:00
Deanna Garcia
a32a2a3b57 Fix errors 2022-02-11 22:12:51 +00:00
Oleg Kolesov
fe87de31bf
#9293 - incompatible return type php 8.1 (#9301) 
* #9293 - fix Missing function's return type declaration (incompatible return type php 8.1)

* #9293 - remove return type void for compatible with php 7.0

* #9293 - add todo for mixed return type

Co-authored-by: Adam Cozzette <acozzette@google.com>
 2022-02-11 11:19:12 -08:00
Deanna Garcia
e760984a59 First try 2022-02-11 19:13:07 +00:00
Anthony Dmitriyev
2ce9604227
Use rb_obj_class instead of CLASS_OF in Ruby C to ignore singleton classes (#9342) 
Co-authored-by: Adam Cozzette <acozzette@google.com>
 2022-02-11 11:04:10 -08:00
BartH
2495d220fa
Added Embedded Proto to options.md to reserve the extenion number for the custom options. (#9493) 2022-02-11 08:08:25 -08:00
Deanna Garcia
c946f0bb70 Merge branch 'master' of github.com:protocolbuffers/protobuf into ktExport 2022-02-10 18:20:35 +00:00
Brent Shaffer
ce57b5bab6
fix: [PHP] add missing reserved classnames (#9458) 
* fix: add missing reserved classnames

* Try to remove PARENT and SELF from reserved constants

* add back for tests

* add to validConstantNames

* update kReservedNamesSize
 2022-02-10 09:16:20 -08:00
David Supplee
dfcbdb8ca0
fix: use E_USER_ERROR for trigger_error calls (#9462) 
* fix: use E_USER_ERROR for trigger_error calls

* fix: use E_USER_ERROR for trigger_error calls
 2022-02-10 09:03:34 -08:00
Adam Cozzette
d5ef16c6eb
Ruby: rename max_recursion_depth to recursion_limit (#9486) 
This will help keep the terminology consistent with the other language
implementations.
 2022-02-09 10:21:13 -08:00
Elliotte Rusty Harold
9748e4c52c
add Eclipse metafiles (#9485) 2022-02-09 12:19:33 -05:00
Lukas Fittl
fbe6ab2487
[Ruby] Message.decode/encode: Add max_recursion_depth option (#9218) 
* Message.decode/encode: Add max_recursion_depth option

This allows increasing the recursing depth from the default of 64, by
setting the "max_recursion_depth" to the desired integer value. This is
useful to encode or decode complex nested protobuf messages that otherwise
error out with a RuntimeError or "Error occurred during parsing".

Fixes #1493

* Address review comments

Co-authored-by: Adam Cozzette <acozzette@google.com>
 2022-02-09 08:44:12 -08:00
Timo Lange
4ed3941e27
[CMake] Allow custom plugin options e.g. to generate mocks (#9105) 
* add plugin options

* refactored comment message

* added tabs for better readability

* removed newlines as they are not working properly

* allow PROTOC_OPTIONS and EXPORT_MACRO in parallel for protobuf_generate
 2022-02-09 08:21:45 -08:00
Joshua Haberman
ce731e2f52
Merge pull request #9482 from haberman/sync-stage 
Integrate from Piper for C++, Java, and Python
 2022-02-09 00:14:43 -08:00
Joshua Haberman
73f772b666 Added AniesTest.kt to Makefile.am. 2022-02-08 23:28:10 -08:00
Joshua Haberman
09b2c6a2b4 Removed conflicting/redundant variable declaration. 2022-02-08 23:07:12 -08:00
Joshua Haberman
5c5cd186b0 Added missing Kotlin file to EXTRA_DIST. 2022-02-08 23:06:55 -08:00
Joshua Haberman
fb9f5862d3 Fixed JavaScript conformance test and failure list. 2022-02-08 23:06:32 -08:00
Joshua Haberman
b175176124 Added changelog entries. 2022-02-08 21:01:46 -08:00
Joshua Haberman
06196e9b4c Merge tag 'refs/tags/sync-piper' into sync-stage 2022-02-08 20:53:32 -08:00
Joshua Haberman
dce403a8b3 Sync from Piper @427369078 
PROTOBUF_SYNC_PIPER
 2022-02-08 20:53:31 -08:00
Joshua Haberman
2d69d44cc1
Merge pull request #9479 from haberman/sync-stage-2 
Integrate from Piper for C++, Java, and Python
 2022-02-08 20:47:40 -08:00
Joshua Haberman
53d409ca54 Removed redundant/unnecessary variable definition. 2022-02-08 20:03:11 -08:00
Joshua Haberman
5aacba062b Resolved remaining conflict markers. 2022-02-08 18:38:48 -08:00
Joshua Haberman
42e806fbf2 Merge branch 'master' into sync-stage-2 2022-02-08 18:36:24 -08:00