Commit Graph

8359 Commits

Author SHA1 Message Date
Matt Fowles Kulukundis
8d8ba6acc3
Merge pull request #8637 from dschopf/fix-qnx-7.0-support
Fix QNX 7.0 support #8593
2021-06-04 12:53:58 -04:00
Matt Fowles Kulukundis
c05e7ad0a8
Merge pull request #8690 from maxgolov/maxgolov/vs2019_16.10_constinit_broken
constinit not working as expected in Visual Studio 2019 Update 16.10
2021-06-03 17:06:29 -04:00
Jan Tattermusch
439e6cf403
Merge pull request #8666 from jtattermusch/protobuf_fix_result_parser
OSS benchmarks: print benchmarks JSON results to build job log
2021-06-03 19:49:06 +02:00
Elliotte Rusty Harold
7a374d4a2f
deps: update to Guava 30.1.1 (#8521)
@eklitzke
2021-06-03 10:40:17 -07:00
Paul Yang
548e01324e
Merge pull request #8689 from deannagarcia/merge3.17.2
Merge 3.17.x into master
2021-06-03 10:39:39 -07:00
Max Golovanov
bc46fce1bd constinit not working as expected in Visual Studio 2019 Update 16.10 2021-06-02 15:43:50 -07:00
Deanna Garcia
50a317556a Fixing merge conflict 2021-06-02 22:31:51 +00:00
Deanna Garcia
506f2273d1 Merging 3.17.x branch into master 2021-06-02 22:29:40 +00:00
Matt Fowles Kulukundis
b650ea44b1
Merge pull request #8557 from yuzawa-san/osx-m1-fix
protoc maven artifacts: reuse osx-x86_64 for osx-aarch_64
2021-06-02 16:39:38 -04:00
Paul Yang
bd42fcc7a3
Merge pull request #8652 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-06-01 15:20:53 -07:00
Kelvin Jin
fd896ba23e
Use modern JS tooling instead of Closure's deprecated Python scripts. (#8610) 2021-06-01 15:17:06 -07:00
Thomas Van Lenten
3069f82bbc Tweak tests to allow common protos to evolve more.
Don't check field counts, instead only test based on the fields that exists (and
likely will never exist). This allows the protos to evolve with almost zero
chance of the tests breaking for those other changes.
2021-06-01 15:10:06 -04:00
Thomas Van Lenten
0dc4ad80d1 Some cpp style fixes. 2021-06-01 13:37:59 -04:00
Yoav Miller
0b05994474
fixed warning about missing pragma warning push (#8678) 2021-06-01 08:59:15 -07:00
Jan Tattermusch
b4a06a193b print benchmarks JSON results to build job log 2021-05-31 11:07:33 +02:00
Jan Tattermusch
0b8d13a1d4
Merge pull request #8665 from jtattermusch/protobuf_fix_benchmark_script
Fix OSS benchmarking script
2021-05-31 11:02:20 +02:00
Matt Fowles Kulukundis
dd247c20ad
Merge pull request #8673 from mrjoel/mrjoel/correct-export-order
Correct ordering of export API for DescriptorTable
2021-05-28 12:54:42 -04:00
Joel Johnson
11edc34d08 Correct ordering of export API for DescriptorTable
This resolves issues with GCC and Clang warning (as error) about
attribute in an unallowed location, in particular when used with a
generated file using a dllexport_decl value of [[gnu::visibility]].

The correct ordering is already used in the compiler in
FileGenerator::ForwardDeclarations() for each of classes_, as well
as for other existing local values in pregenerated files. This
change ensures that all usages can compile without issue.
2021-05-27 13:43:40 -06:00
Thomas Van Lenten
f415285c3e Scope string usage with the namespace. 2021-05-27 14:36:20 -04:00
Thomas Van Lenten
8275756142 ObjC: Add stdin/stdout/stderr to reserved word list.
This will cause fields named exactly these names to get `_p` appended to them.
This is being done since the C89/C99/etc specs say these name should be macros,
so in an ObjC context, trying to access the fields would result in runtime
failures for unknown selectors. The only way the fields were usable was to use
KVC or via the descriptor based apis, but if someone hit that they likely would
have reported the general issue also.
2021-05-27 14:13:32 -04:00
Adam Cozzette
d2f6d9b721
Merge pull request #8650 from acozzette/merge-3.17.x
Merge 3.17.x into master
2021-05-27 08:05:54 -07:00
Jan Tattermusch
ceafbf9132 more cleanup 2021-05-27 12:29:29 +02:00
Jan Tattermusch
75afc88eae disable php benchmark and other cleanup 2021-05-27 11:32:50 +02:00
Jan Tattermusch
6135c916a4 fix benchmark run.sh script 2021-05-27 10:30:12 +02:00
Benjamin Peterson
fa31183250
Add internal.bzl to EXTRA_DIST. (#8663)
internal.bzl is required to load java/core/BUILD and java/lite/BUILD, so it must be distributed.
2021-05-26 13:01:46 -07:00
Petr Jediný
3737676d83
Reserve 1109 for Glitchdot (#8662) 2021-05-26 12:19:33 -07:00
Adam Cozzette
4e0a1119c0
Fix the Docker build for our javascript Docker image (#8661)
I noticed that our JavaScript Docker image is a couple years old and
seems to have an old NPM version that may be causing problems on #8610,
so I went ahead and rebuilt the image. To do that successfully, I had to
set some environment variables in the Dockerfile so that it can build
successfully without having to ask for input about timezone
configuration. This seems to be a known issue described here:
https://serverfault.com/questions/949991/how-to-install-tzdata-on-a-ubuntu-docker-image
I also updated it to explicitly install Python since that is required
for part of our JavaScript build.
2021-05-26 08:56:40 -07:00
deannagarcia
d3b71f21bb
Merge pull request #8657 from deannagarcia/3.17.x-202105251932
Update version to 3.17.2
2021-05-25 13:47:49 -07:00
Yuriy Chernyshov
b3183b54c4
Use template Delete<> for invoking a dependent template (#8655)
This is a continuation of #8579
2021-05-25 13:27:22 -07:00
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