Commit Graph

7562 Commits

Author SHA1 Message Date
Jan Tattermusch
c855561c54 initial implementation of buffer encoding 2020-06-02 19:58:03 +02:00
Jan Tattermusch
7cb5597013
Overcome the ref struct limitation for pre-roslyn compilers by introducing GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE for generated code (#7490)
* enable compatibility mode in codegen

* regenerate protos

* improve readability

* more robust way of figuring out path to old C# compiler

* add recent C# changes
2020-06-02 00:26:25 -07:00
Joshua Haberman
c0b79c5a39
Merge pull request #7583 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-06-01 18:42:07 -07:00
Joshua Haberman
8d93bc1826 Normalized formatting of macros.
It's a bit unforuntate to lose the nesting, but
that's what clang-format is telling us here.
2020-06-01 16:56:18 -07:00
Joshua Haberman
75e4c446a3 Added changelog entries for Piper sync. 2020-06-01 16:35:52 -07:00
Joshua Haberman
183cdec7cd Sync from Piper @314226556
PROTOBUF_SYNC_PIPER
2020-06-01 16:32:31 -07:00
Joshua Haberman
9ce8c330e7
Updated version to 3.12.3 and updated CHANGES.txt. (#7580)
* Updated version to 3.12.3 and updated CHANGES.txt.

* Re-ran generate_descriptor_protos.sh and made it more parallel.
2020-06-01 13:36:50 -07:00
Harvey Tuch
e492e5a4ef Fix depset/list confusion in #7458.
See
https://github.com/protocolbuffers/protobuf/pull/7458#issuecomment-633147682.

release notes: no

Signed-off-by: Harvey Tuch <htuch@google.com>
2020-05-29 13:05:58 -07:00
Andreas Herrmann
24fa9550be Update rules_cc
The previous version does not mark the `toolchain_type` as public,
meaning that users of a CC toolchain using
`@rules_cc//cc:toolchain_type` will get build errors along the lines of
```
ERROR:
.../local_config_cc_toolchains/BUILD.bazel:18:1:
in toolchain rule
@local_config_cc_toolchains//:cc-toolchain-armeabi-v7a: alias
'@rules_cc//cc:toolchain_type' referring to target
'@bazel_tools//tools/cpp:toolchain_type' is not visible from target
'@local_config_cc_toolchains//:cc-toolchain-armeabi-v7a'. Check the
visibility declaration of the former target if you think the dependency
is legitimate
```
2020-05-29 13:05:23 -07:00
Joshua Haberman
2cc68efd56
Simplified PHP testing scripts. (#7574)
* Simplified PHP testing scripts.

- allow them to be run from any directory.
- remove "VERSION" arg, we can get PHP from $PATH.

* Added a few places I missed.

* Removed redundant "cd `dirname $0`".

Also replaced all backticks with $(), for consistency.
2020-05-28 19:24:08 -07:00
Joshua Haberman
1688ea8d60
PHP: use php-config instead of explicitly setting include paths. (#7572) 2020-05-28 12:10:53 -07:00
Thomas Van Lenten
2360bacd12 Tweak the union used for Extensions to support old generated code.
Support the old field name as well as the union to keep the old generated code
building.

Fixes #7555
2020-05-28 15:02:31 -04:00
Joshua Haberman
0ff639994d
Fixed Python release script to upload using twine instead of distutils. (#7571) 2020-05-28 10:56:10 -07:00
Joshua Haberman
2d654e8198
Merge pull request #7559 from haberman/merge-312
Merge the 3.12.x branch to master
2020-05-27 09:24:57 -07:00
Jan Tattermusch
30d5b7dbe4
Merge pull request #7561 from jtattermusch/csharp_project_cleanup
C# project cleanup for dotnet SDK 3.1
2020-05-27 17:28:28 +02:00
Jan Tattermusch
040b2a6d07 C# project cleanup 2020-05-27 13:59:51 +02:00
Joshua Haberman
c077d949d8 Merge branch '3.12.x' into merge-312 2020-05-26 16:45:43 -07:00
Joshua Haberman
678da4f76e Updated the changelog for the 3.12.2 release. 2020-05-26 15:55:45 -07:00
Joshua Haberman
beeb621f50
Update protobuf version (#7557) 2020-05-26 15:46:39 -07:00
Joshua Haberman
746c46ed9d
Switch to using git@ for clone, to avoid having to enter password. (#7556) 2020-05-26 13:48:47 -07:00
Joshua Haberman
15d0cd714d
Merge pull request #7551 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-05-26 09:57:07 -07:00
Joshua Haberman
66a189f6b5 Added Changelog entries for Google-internal changes. 2020-05-26 00:37:50 -07:00
Joshua Haberman
eee43838f3 Merge branch 'sync-piper' into sync-stage
# Conflicts:
#	java/core/src/test/java/com/google/protobuf/TextFormatTest.java
2020-05-26 00:26:47 -07:00
Joshua Haberman
0a737d8eb0 Sync from Piper @313142438
PROTOBUF_SYNC_PIPER
2020-05-26 00:26:15 -07:00
Stanley Cheung
ef22086980
Fix :protobuf_objc bazel target (#7538)
* Potential 3.12 ObjC bazel patch

* Add test targets to bazel test

* Remove :protobuf_objc test target
2020-05-21 12:46:35 -07:00
Stanley Cheung
29de97cc5d
Cherry-pick of df719723: Simplify template exporting macros (#7539)
* Cherry-pick of df719723: Simplify template exporting macros

* Fix macro usage
2020-05-21 12:45:34 -07:00
Joshua Haberman
a37cc13b2f Added changelog entry for 3.12.1. 2020-05-20 12:06:30 -07:00
Joshua Haberman
6ad138d85a
Update protobuf version (#7535) 2020-05-20 10:54:29 -07:00
Evan Klitzke
39d730dd96 Use lexical-binding in protobuf-mode.el 2020-05-19 17:15:35 -07:00
Daniel Azuma
cf81f38b5d
Restore binary builds of Ruby 2.3 and 2.4 (#7529) (#7531) 2020-05-19 15:52:59 -07:00
Daniel Azuma
ba1ce70744
Restore binary builds of Ruby 2.3 and 2.4 (#7529) 2020-05-19 15:28:57 -07:00
Joshua Haberman
9952e36f92
Merge release branch into master. (#7517)
* Added background information about proto3 presence. (#7501)

* Fixed bug in map key sorting for Java TextFormat. (#7508)

Fixes: https://github.com/protocolbuffers/protobuf/issues/7505

* Update protobuf version

* Added a changelog entry about the Java fix. (#7516)
2020-05-16 16:42:02 -07:00
Joshua Haberman
0dd036d675
Added a changelog entry about the Java fix. (#7516) 2020-05-15 15:11:25 -07:00
Joshua Haberman
e90b71cdee Update protobuf version 2020-05-15 13:28:07 -07:00
Protobuf Team
63da77bc97 Project import generated by Copybara
PiperOrigin-RevId: 311748964
2020-05-15 09:55:02 -07:00
Joshua Haberman
7276738e79
Fixed bug in map key sorting for Java TextFormat. (#7508)
Fixes: https://github.com/protocolbuffers/protobuf/issues/7505
2020-05-14 17:04:20 -07:00
listonjesse
2ae7cf0e03 Auxillary -> Auxiliary 2020-05-14 07:47:25 -07:00
Harvey Tuch
9482bfd22b Fix depset/list confusion for ctx.attr.deps.
Signed-off-by: Harvey Tuch <htuch@google.com>
2020-05-14 07:45:57 -07:00
Harvey Tuch
7cf3f7a649 Fix CLI "too long" issues in py_proto_library.
Envoy was experiencing failed builds due to lots of duplicate -I in the
CLI. The solution is to generally use depset() as per Starlark best
practice for this sort of thing.

Might fix other issues beyond py_proto_library, anything that depends on
proto_gen.

release notes: no

Signed-off-by: Harvey Tuch <htuch@google.com>
2020-05-14 07:45:57 -07:00
Joshua Haberman
6935eae45c
Merge pull request #7502 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-05-13 17:28:26 -07:00
Joshua Haberman
1e8d04061c Remove includes of deleted "no_arena" protos from ObjC. 2020-05-13 16:31:53 -07:00
Joshua Haberman
79b1c3bac3
Fixed JavaScript Kokoro tests by installing NodeJS. (#7504)
* Fix JavaScript tests.

* Added missing popd.

* Added missing 'export' for $PATH.

* Fixed path to include 'bin'.
2020-05-13 16:16:27 -07:00
Joshua Haberman
27ba0c5bb0
Fixed the PHP Kokoro build. (#7503)
* Fixed the PHP Kokoro build.

* Renamed all PHP7.4 Mac tests -> PHP7.3.
2020-05-13 15:36:21 -07:00
Joshua Haberman
c8fce07914 Removed "no_arena" variants from the build system. 2020-05-13 13:49:35 -07:00
Joshua Haberman
3dcf368c2f Merge branch 'sync-piper' into sync-stage 2020-05-13 13:46:16 -07:00
Joshua Haberman
6ed738305b Sync from Piper @311396324
PROTOBUF_SYNC_PIPER
2020-05-13 13:46:15 -07:00
Joshua Haberman
4bbdffacf2
Added background information about proto3 presence. (#7501) 2020-05-13 12:49:21 -07:00
Jan Tattermusch
440a156e1c
Merge pull request #6904 from erikma/dev/erikmav/byteStringMemory
C#: Allow readonly view of byteString's data with ByteString.Memory property
2020-05-13 15:44:01 +02:00
Joshua Haberman
f945fdf2d9
Merge pull request #7497 from haberman/merge-312-branch
Merge 3.12.x branch to master after 3.12.0-rc2
2020-05-12 18:53:50 -07:00
Joshua Haberman
62ab8333c9 Merge branch '3.12.x' into merge-312-branch 2020-05-12 16:59:55 -07:00