Commit Graph

7643 Commits

Author SHA1 Message Date
Joshua Haberman
b70695dd68 Sync from Piper @338707351
PROTOBUF_SYNC_PIPER
2020-10-23 11:07:04 -07:00
Joshua Haberman
de371235c9 Sync from Piper @338284531
PROTOBUF_SYNC_PIPER
2020-10-21 10:04:14 -07:00
Joshua Haberman
38d6de1eef Sync from Piper @334206209
PROTOBUF_SYNC_PIPER
2020-09-28 11:54:54 -07:00
Joshua Haberman
70b02861f8
Merge pull request #7845 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-08-25 21:33:27 -07:00
Joshua Haberman
5c26cae18c Re-add change that was somehow lost. 2020-08-25 14:42:47 -07:00
Joshua Haberman
e1ee430d16 Re-add fix that somehow was lost pushing back to Piper. 2020-08-25 14:28:24 -07:00
Joshua Haberman
28d6aa04f6 Merge tag 'refs/tags/sync-piper' into sync-stage 2020-08-24 15:48:44 -07:00
Joshua Haberman
f3cf99c0fb Sync from Piper @328224070
PROTOBUF_SYNC_PIPER
2020-08-24 15:48:43 -07:00
Adam Cozzette
1b18833f4f Tweaked update_version.py to leave PHP notes blank
Until now update_version.py has copied the notes from the previous PHP
release, which is not very useful.
2020-08-21 16:33:52 -07:00
Adam Cozzette
6da79e94b0 Fixed VERSION_SUFFIX logic in update_version.py
This commit makes a couple of fixes:
- Make sure we always update the suffix, since even for a non-RC release
  we need to clear the suffix.
- Make sure the suffix is properly quoted and begins with -rc
2020-08-21 16:33:52 -07:00
Lőrinc Pap
4b93993ac7 Update Gradle dependency reference format
See https://docs.gradle.org/current/userguide/java_library_plugin.html
> The compile, testCompile, runtime and testRuntime configurations inherited from the Java plugin are still available but are deprecated. You should avoid using them, as they are only kept for backwards compatibility.
2020-08-20 15:13:03 -07:00
CauhxMilloy
090d28e8f7
Null Check in UnknownField::AddAll() (#7328)
UnknownField::AddAll() is called (multiple times) from UnknownField::MergeFrom(). The `extras` parameter is one of: `varintList`, `fixed32List`, `fixed64List`, `lengthDelimitedList`, or `groupList`. All of these members can be null, and are appropriately checked in other usage. If attempting to parse a proto with unknown extensions, and exception is thrown (NRE).
This adds the appropriate null check inside UnknownField::AddAll().
2020-08-20 14:42:53 -07:00
Misha Seltzer
223e89157a Removed test files from pypi distribution generation code.
Fixes #7493

By removing all test files from the distribution, we've reduced the .whl
file size from 1259808B (1.2MB) to 996042B (973K), which is 21% reduction,
And reduced the unpacked size from 5317178B (5.1MB) to 3251811B (3.2MB),
which is 39% reduction.

Size was measured for the protobuf-3.11.3-cp35-cp35m-manylinux1_x86_64.whl release.
2020-08-19 17:16:36 -07:00
Afshin Pir
a446e6472b Previously, I had incorrectly used some newer features of CMake(version 3.14). But Now I have updated this code to work with older versions of CMake too. 2020-08-19 17:03:36 -07:00
Adam Yi
88f3ef7d1d [bazel] Add default shell env to gen_well_known_protos_java
We may need the shell environment (potentially augmented with
`--action_env`) to invoke protoc on Windows. If protoc was built with
mingw, it probably needs .dll files in non-default locations that must be
in PATH. Previously with `--compiler=mingw-gcc`,
`bazel build //:gen_well_known_protos_java` would fail on Windows. This
CL fixes the issue.

Also we have `default_shell_env` set to True for `ProtoCompile`, this makes
the behavior consistent.

See #2933, and
585a27ad0a/proto/compiler.bzl (L130)
2020-08-19 17:01:40 -07:00
Mathijs Vogelzang
543817295e Add R8 rule to documentation
Using default production Android build and protobuf-lite leads to RuntimeExceptions. The workarounds are documented in issues and I took those discussions and summarized them in the lite.md file.
2020-08-19 15:44:57 -07:00
Saurabh Singhal
7db720e075 Modify update_version.py to update the version suffix as well. 2020-08-19 11:31:50 -07:00
Saurabh Singhal
b970be43ff Display beta version in "protoc --version"
Display the beta version when "protoc --version" is executed. Use
PROTOBUF_VERSION_SUFFIX for this purpose.
2020-08-19 11:31:50 -07:00
Adam Cozzette
7e787e091e Made the Codespell check skip protobuf generated code 2020-08-19 10:31:31 -07:00
Adam Cozzette
e5fe9b8cbd Updated CHANGES.txt
Now that 3.13.0 has been released, this commit updates CHANGES.txt to
mention 3.13.0 instead of 3.13.0-rc1 and to include the recent PHP
changes. I also added a short explanation of the 3.12.4 release.

Fixes #7820.
2020-08-19 10:31:31 -07:00
Joshua Haberman
214c77e1b7
Merge pull request #7698 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-08-18 09:29:35 -07:00
Joshua Haberman
59d3966b1f Updated failure list for the PHP C implementation. 2020-08-17 17:55:16 -07:00
Joshua Haberman
492d0b543e Added new failing conformance tests to failure list. 2020-08-17 17:15:34 -07:00
Joshua Haberman
b3cdd40ef0 Added new map.cc file to Bazel BUILD file. 2020-08-17 17:12:44 -07:00
Joshua Haberman
82bad2e1eb Fixed uninitialized variable warning.
Unfortunately there's not an easy way to annotate that the
"unexpected mode" case is unreachable (even GOOGLE_LOG(FATAL)
in a default: case doesn't do it).
2020-08-17 17:09:56 -07:00
Joshua Haberman
2b3a79735b Added changelog entries for the sync. 2020-08-17 16:18:11 -07:00
Joshua Haberman
32a94ce353 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	csharp/src/Google.Protobuf.Test/testprotos.pb
2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474 Sync from Piper @327110949
PROTOBUF_SYNC_PIPER
2020-08-17 15:26:13 -07:00
Adam Cozzette
f1b6076ea2
Merge pull request #7821 from acozzette/3.13.x-202008171106
Merged 3.13.x into master
2020-08-17 12:56:05 -07:00
Adam Cozzette
cddcbb93f0 Fixed spelling (reenable -> re-enable) 2020-08-17 11:37:42 -07:00
Adam Cozzette
58f4260e8e Merged 3.13.x into master 2020-08-17 11:06:11 -07:00
Adam Cozzette
fde7cf7358 Update protobuf version 2020-08-14 15:20:53 -07:00
Jie Luo
0710535089 Fix segment fault for proto3 optional (#7805)
* Fix segment fault for proto3 optional

 Fixes #7801
2020-08-14 12:57:13 -07:00
Jie Luo
8a71927d74
Fix segment fault for proto3 optional (#7805)
* Fix segment fault for proto3 optional

 Fixes #7801
2020-08-14 11:20:37 -07:00
Adam Cozzette
2ad43bfd3d Fixed tests for Python 2 in python/release.sh
Setuptools 45.0 removed support for Python 2, so to keep these tests
working for Python 2 I updated the script to install an older setuptools
version.
2020-08-14 09:50:38 -07:00
Adam Cozzette
14982862f5 Removed conflicting C# version line
Somehow we ended up with two conflicting versions listed for C#, so this
commit removes the incorrect one (the correct one is 3.13.0-rc3).
2020-08-14 09:21:30 -07:00
Adam Cozzette
98c2e69f8c Update protobuf version 2020-08-12 14:49:20 -07:00
Paul Yang
5ce6232605
No need to generate addtional has method for proto2 (#7802)
* No need to generate addtional has method for proto2

* Also remove has property
2020-08-12 13:18:28 -07:00
Paul Yang
d4ca92962c
Port php c extension to php8 (#7793)
* Only ported c extension to php8.
* Didn't fixed the issue of throwing warnings for missing arginfo in bundled files.
* Tests not fixed, because syntax of phpunit (<7 vs >9.3) are not compatible.
* In next release, needs to drop php5 and php7.0 support (in order to use phpunit > 7)
2020-08-11 19:30:46 -07:00
Brendan Linn
389bd06d0a //:protobuf_java_util: discontinue JDK 7 compatibility support.
6bbd56dfd9 removed the -source 7 -target
7 javacopts from the //java:{core,lite} targets in order to improve
compatibility with more recent versions of javac. (see that commit for
more discussion of motivation.) but the commit left -source 7 -target
7 javacopts on the related //java/util target. i've confirmed with the
commit author that this was just an oversight, so remove these flags
as well.
2020-08-11 16:25:41 -07:00
Peter Newman
e56cbaf1d3
Add a Codespell action (#7752)
* Fix a typo

* Add codespell action

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* Add an ignore words list

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Exclude some more words and folders

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7675.

* Revert unparseable->unparsable corrections

* Skip more locations and add some ignore words that haven't been merged yet
2020-08-10 16:58:25 -07:00
Paul Yang
008c72146f
Add docker file for php8.0 (#7790) 2020-08-10 14:35:18 -07:00
Bo Yang
8947701be5 Add docker file for php8.0 2020-08-10 13:51:06 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors (#7751)
* Fix a typo

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7675.

* Revert unparseable->unparsable corrections
2020-08-10 11:08:25 -07:00
Benoît Quenaudon
8d74659c7a Reserve 1087 for Wire wire_package
release notes: no
2020-08-10 10:19:56 -07:00
Nikolai Vavilov
6b73371e7d Update third_party.md
Add a library that helps develop protoc plugins in Node.js, and an example plugin that can serve as a template for alternative generators.
2020-08-10 10:14:55 -07:00
Jeremy Volkman
963ead3e37 [docs] Update IntelliJ plugin link
The previously-linked project hasn't been updated for years.
2020-08-10 10:13:28 -07:00
Andy Getz
bd7d87269f Change some SplitStringUsing calls to Split.
This is done to match an internal Google change necessary to deprecate an old internal API.  Nothing needs to change here, however making the change allows the internal code to continue to match the Github code, which is desirable.
2020-08-10 10:02:36 -07:00
Joshua Haberman
610bbd0b95 Fixed compile_extension.sh --release to actually enable optimization. (#7766) 2020-08-07 14:44:49 -07:00
Paul Yang
0929596575 Check realoneof in json parsing (#7763)
* Check realoneof in json parsing

* Fix whichoneof to also work for synthetic oneof
2020-08-07 14:44:49 -07:00