Commit Graph

8481 Commits

Author SHA1 Message Date
Deanna Garcia
5b8208ecea Update protobuf version 2021-05-25 19:36:05 +00:00
Matt Fowles Kulukundis
093824aa0a
Merge pull request #8654 from panmingyang2009/master
[Objective-C] Comment Correcting
2021-05-25 14:28:14 -04:00
deannagarcia
b87d364831
Merge pull request #8653 from deannagarcia/fixDuplicateClassErrors
Remove maven-bundle-plugin to fix duplicate class errors
2021-05-25 10:52:58 -07:00
Deanna Garcia
5fac12fff0 Reverting the Makefile spacing changes 2021-05-25 17:38:17 +00:00
Deanna Garcia
3f8f6e925d Removing more files that were added during rebasing 2021-05-25 17:35:03 +00:00
Deanna Garcia
713f2d0008 Removing files that were added during rebasing 2021-05-25 17:33:14 +00:00
Deanna Garcia
021329b7e7 resolving conflicts 2021-05-25 17:27:07 +00:00
Deanna Garcia
2f8d310048 Fixing objc tests 2021-05-25 17:25:04 +00:00
Deanna Garcia
eb57ffe807 Reverting last change since tests are still failing 2021-05-25 17:25:03 +00:00
Deanna Garcia
6319a23bff Run update_file_lists.sh 2021-05-25 17:25:03 +00:00
Deanna Garcia
f44755496f Updating makefile to pass the tests 2021-05-25 17:24:15 +00:00
Deanna Garcia
76bd17ca5b Add another file to Makefile 2021-05-25 17:24:15 +00:00
Deanna Garcia
f9a60fc8ae Add another header to Makefile 2021-05-25 17:24:15 +00:00
Deanna Garcia
eb3ab8c59e Add headerfiles to Makefile 2021-05-25 17:24:15 +00:00
punmy
255a28629e Correct a comment of GPBFieldDescriptor
The comment of property 'mapKeyDataType' has a mistake.
If the field is a map, the value's type is not fieldType.
Instead, it's dataType.
2021-05-25 15:01:12 +08:00
Joshua Haberman
45bb1d2feb Added new file to build files. 2021-05-24 15:33:54 -07:00
Joshua Haberman
f55aafc93e Updated changelog. 2021-05-24 13:57:40 -07:00
Joshua Haberman
a8d8eb17df Merge tag 'refs/tags/sync-piper' into sync-stage 2021-05-24 13:49:40 -07:00
Joshua Haberman
9521803d40 Sync from Piper @375548932
PROTOBUF_SYNC_PIPER
2021-05-24 13:49:39 -07:00
Joshua Haberman
636132bd77
Merge pull request #8617 from deannagarcia/sync-stage
Integrate from Piper for C++, Java, and Python
2021-05-24 13:45:21 -07:00
Deanna Garcia
4c3d50b946 Fixing objc tests 2021-05-24 19:28:04 +00:00
Adam Cozzette
b506c31de0 Merge branch '3.17.x' into merge-3.17.x 2021-05-24 12:24:38 -07:00
Joshua Haberman
e635605003
Added missing release notes for 3.17.1. (#8649) 2021-05-24 11:15:46 -07:00
Matt Fowles Kulukundis
998d3a343a
Merge pull request #8642 from JoelLinn/fix-mingw-bswap
Fix MinGW compilation
2021-05-22 19:56:54 -04:00
Joel Linn
40ec3b2bfc Fix MinGW compilation
- Fixed syntax error in platform independent bswap_64 implementation
2021-05-23 01:31:09 +02:00
Jan Tattermusch
6bdfc3bb67
Merge pull request #8638 from jtattermusch/php_aarch64_tests
Run PHP aarch64 tests on the CI (with an emulator)
2021-05-22 16:38:50 +02:00
Joshua Haberman
367e4691d2
Fixed memory bug: properly root repeated/map field when assigning. (#8639)
* Fixed memory bug: properly root repeated/map field when assigning.

Previously the protobuf extension would not properly root
memory from a repeated field or map when assigning to a
message field (see the attached test case).  This could cause
crashes if the repeated field is subsequently accessed.

* Add accidentally-deleted Ruby test.
2021-05-21 23:04:09 -07:00
Jan Tattermusch
95f5995cce add kokoro job configs for php aarch64 linux test 2021-05-21 09:53:54 +02:00
Jan Tattermusch
2d2ebf5e97 add php aarch64 linux emulated tests 2021-05-21 09:51:22 +02:00
Daniel Schopf
bbccb31e8b Fix compiler error for empty default ctor for std::atomic<int> variables 2021-05-21 09:32:45 +02:00
Daniel Schopf
12a9feca47 Fix compiler error with brace initializer (conflicts with #8492) 2021-05-21 09:32:11 +02:00
Daniel Schopf
779a6adfc8 Add support for 64 bit QNX builds 2021-05-21 09:30:36 +02:00
Daniel Schopf
bd9d47db41 endian.h is not available on QNX 2021-05-21 09:29:58 +02:00
Daniel Schopf
b2b5446af0 Fix compiler error due to mismatched braces (broken in f5fd897c1d) 2021-05-21 09:29:06 +02:00
Deanna Garcia
b67ec9f70c Reverting last change since tests are still failing 2021-05-20 22:23:29 +00:00
Deanna Garcia
092a14fbe7 Experimenting to get tests to pass. 2021-05-20 21:32:01 +00:00
Deanna Garcia
1b827fa114 Run update_file_lists.sh 2021-05-20 18:52:08 +00:00
Joshua Haberman
96ccf402fe
Remove build badges, they were consistently out of date and not very useful. (#8634) 2021-05-20 10:06:36 -07:00
Adam Cozzette
52784ced2f
Update protobuf version (#8633) 2021-05-19 16:43:44 -07:00
Deanna Garcia
ff7178ddf9 Merge branch 'master' into sync-stage 2021-05-19 23:00:22 +00:00
Joshua Haberman
0b87475592
Php & Ruby Cherry Picks for 3.17.1 (#8632)
* Some more updates to PHP testing infrastructure (#8576)

* WIP.

* Added build config for all of the tests.

* Use ../src/protoc if it is available, for cases where Bazel isn't available.

* Added test_php.sh.

* Fix for the broken macOS tests.

* Move all jobs to use php80 instead of lots of separate jobs.

* Only pass -t flag if we are running in a terminal.

* Updated php_all job to use new Docker stuff.

* Fixed PHP memory leaks and arginfo errors (#8614)

* Fixed a bunch of incorrect arginfo and a few incorrect error messages.

* Passes mem check test with no leaks!

* WIP.

* Fix build warning that was causing Bazel build to fail.

* Added compatibility code for PHP <8.0.

* Added test_valgrind target and made tests Valgrind-clean.

* Updated Valgrind test to fail if memory leaks are detected.

* Removed intermediate shell script so commands are easier to cut, paste, and modify.

* Passing all Valgrind tests!

* Hoist addref into ObjCache_Get().

* Removed special case of map descriptors by keying object map on upb_msgdef.

* Removed all remaining RETURN_ZVAL() macros.

* Removed all explicit reference add/del operations.

* Added REFCOUNTING.md to Makefile.am.

* Updated upb version and fixed PHP to not get unset message field. (#8621)

* Updated upb version and fixed PHP to not get unset message field.

* Updated changelog.

* Fixed preproc test to handle old versions of Clang withot __has_attribute().

* A second try at fixing __has_attribute().

* Copy __has_attribute() fix to cc file also.

* Updated failure list for PHP for fixed test.

* Updated version of upb for Ruby (#8624)

* Updated upb.

* Preserve legacy behavior for unset messages.

* Updated failure list.

* Updated CHANGES.txt.

* Added erroneously-deleted test file.

* Fixed condition on compatibility code.

* Re-introduced deleted file again, and fixed Rakefile to not delete it.

* Fix generation of test protos.
2021-05-19 15:53:47 -07:00
Deanna Garcia
4793f80ad3 Merge branch 'sync-stage' of https://github.com/deannagarcia/protobuf into sync-stage 2021-05-19 22:25:08 +00:00
Deanna Garcia
8d65655494 Fix maybe uninitialized error 2021-05-19 22:24:22 +00:00
Charles Mita
f1fe79dd12
Use cfg="exec" instead of cfg="host" in internal rules. (#8626)
Bazel has switched its protobuf rules to make them use the proto
compiler in the exec configuration instead of the host configuration.

However, if rules in protobuf still use the host configuration then
multiple copies of the compiler can end up being built.

cfg="host" is deprecated in any case and being replaced with cfg="exec"
where possible.
https://docs.bazel.build/versions/master/skylark/rules.html#configurations
2021-05-19 11:11:13 -07:00
deannagarcia
d1098000ce
Merge branch 'master' into sync-stage 2021-05-18 13:48:32 -07:00
Deanna Garcia
d43433d20f Updating makefile to pass the tests 2021-05-18 20:44:04 +00:00
Thomas Klausner
f71a662db4
Fix unportable test(1) operator. (#8616) 2021-05-18 07:24:59 -07:00
Joshua Haberman
dd69a484c0
Updated version of upb for Ruby (#8624)
* Updated upb.

* Preserve legacy behavior for unset messages.

* Updated failure list.

* Updated CHANGES.txt.

* Added erroneously-deleted test file.

* Fixed condition on compatibility code.

* Re-introduced deleted file again, and fixed Rakefile to not delete it.

* Fix generation of test protos.
2021-05-17 22:40:33 -07:00
Joshua Haberman
7611164792
Updated upb version and fixed PHP to not get unset message field. (#8621)
* Updated upb version and fixed PHP to not get unset message field.

* Updated changelog.

* Fixed preproc test to handle old versions of Clang withot __has_attribute().

* A second try at fixing __has_attribute().

* Copy __has_attribute() fix to cc file also.

* Updated failure list for PHP for fixed test.
2021-05-17 15:27:05 -07:00
Dennis Shao
0710536d30
Merge pull request #8623 from shaod2/kotlin-gen-docs
Kotlin: update pom.xml to include dokka
2021-05-17 17:01:14 -05:00