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

9103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cozzette
b44784cf30
Fix update_version.py script (#9554) 
Two small fixes to update_version.py:
- The regex for updating SOVERSION in cmake files was not quite right. I
  fixed it to reflect that the value is a plain integer and not of the
  form x.y.z
- For some reason the code for updating PHP_PROTO_VERSION appeared 3
  times and led to a spurious warning, so I removed the extra calls
  there.
 2022-02-25 15:30:07 -08:00
Jason Lunn
1a10c58c2f
Merge pull request #9549 from JasonLunn/jruby-release-bump 
Update JRuby 9.2.19.0 -> 9.2.20.1 and 9.3.0.0 to 9.3.3.0.
 2022-02-25 17:12:30 -05:00
deannagarcia
4738b8ee08
Merge pull request #9553 from protocolbuffers/deannagarcia-patch-2 
Make protoc executable names consistent
 2022-02-25 10:47:07 -08:00
deannagarcia
5b3f853d7d
Make protoc executable names consistent 
Rename ppc64 cpu to ppcle_64 to match current release.
 2022-02-25 10:45:28 -08:00
Dimitris Koutsogiorgas
89c40311db Rename proto_package_to_prefix_mappings_path to package_to_prefix_mappings_path. 2022-02-25 13:10:36 -05:00
deannagarcia
b9bcec8ac3
Merge pull request #9537 from protocolbuffers/deannagarcia-patch-1 
Fix package naming rule
 2022-02-25 09:47:41 -08:00
Jason Lunn
df0999141e Update JRuby 9.2.19.0 -> 9.2.20.1 and 9.3.0.0 to 9.3.3.0. 2022-02-25 14:11:12 +00:00
Thomas Van Lenten
6a77c9bab4 Make the ObjC support conditional to darwin. 
Fixes #9392
 2022-02-24 17:39:04 -05:00
Thomas Van Lenten
e8470340e0 Rename ExpectedPrefixesCollector to PackageToPrefixesCollector 
Now that two files use the format, tweak the naming to the format for the file
vs. the usage(s).

Also add a "usage" param so the two places can provide a little context for any
error messages generated while parsing.
 2022-02-24 16:11:10 -05:00
deannagarcia
a5168a6e96
Fix package naming rule 
Remove quotes around CPU since we want the variable evaluated instead of the string. This will allow the win64 build to get the correct name.
 2022-02-23 16:45:56 -08:00
Dimitris Koutsogiorgas
a112c4ab96 Add prefix_to_proto_package_mappings_path ObjC option. 2022-02-23 14:26:53 -05:00
Arfrever
d0c06bcd93
cmake: Set correct sonames for libprotobuf-lite.so and libprotoc.so (#9529) 
Soname was set for libprotobuf.so in commit a9cf69a0ed,
but similar changes for libprotobuf-lite.so and libprotoc.so were missed.

Fixes: #8635

Co-authored-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@GMail.Com>
 2022-02-22 15:53:14 -08:00
Dimitris Koutsogiorgas
db56692883 Revert "objective-c: Add objc_class_prefix generation option." 
This reverts commit b5ab0b7a18.
 2022-02-22 14:24:41 -05:00
Jorg Brown
2f91da585e
Merge pull request #9528 from dlj-NaN/sync-stage 
Integrate from Piper for C++, Java, and Python
 2022-02-18 15:32:19 -08:00
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