AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
7,451 Commits 35 Branches 138 Tags 124 MiB
2cc68efd56
Commit Graph

7451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Joshua Haberman
7e7777e8a1
Merge pull request #7495 from dsnet/master 
Fix integration tests for Go examples
 2020-05-12 15:05:23 -07:00
Joe Tsai
654edd8e74 Fix integration tests for Go examples 
A proper integration test should be hermetic such that its operation
is agnostic to whatever happens outside of its controlled environment.
The script is not so since it uses a fixed (and very old) version of Go,
but continues to build protoc-gen-go from head, leading to an eventual
breakage when protoc-gen-go at head no longer operates on such an old
version of Go.

Fix the script to pin to an older version of protoc-gen-go (i.e., v1.3.5).
 2020-05-12 14:47:54 -07:00
Joshua Haberman
8053525846 Updated Changelog for 3.12.0-rc2. 2020-05-12 14:39:14 -07:00
Joshua Haberman
73e48b4fb0
Merge pull request #7494 from haberman/3.12.x-202005121247 
Update protobuf version to 3.12.0-rc2
 2020-05-12 13:38:38 -07:00
Joshua Haberman
f597a24627 Update protobuf version 2020-05-12 12:49:46 -07:00
Joshua Haberman
51199fcba2
Merge pull request #7491 from haberman/cherry 
Cherry-pick fixes onto 3.12.x branch for 3.12.0-rc2
 2020-05-12 12:45:16 -07:00
Joshua Haberman
01e8c0fa34 Cherry-pick the fix to #7480 from #7485. 2020-05-12 11:34:02 -07:00
Joshua Haberman
c0b1ce00f3 Cherry-pick the fix for https://github.com/protocolbuffers/protobuf/issues/7463. 2020-05-12 11:06:05 -07:00
Jon Skeet
3c3646fa78 Implement HasPresence for C# 
FieldDescriptor.HasPresence returns true if both ClearValue and HasValue (on the accessor) can be expected to work. Some fields have a working ClearValue, but no HasValue; HasPresence returns false for those fields.

Generally:

- Extension fields have presence if and only if they're singular
- Repeated fields do not support presence
- Map fields do not support presence
- Message fields support presence
- Oneof fields support presence (this includes synthetic oneof fields, so that covers proto3 optional singular fields)
- Proto2 singular primitive fields support presence
- Proto3 singular primitive fields do not support presence (unless they're in a oneof, covered above)
 2020-05-12 10:58:05 -07:00
Jan Tattermusch
fc5ded36bc Merge pull request #7434 from jtattermusch/csharp_expose_options 
C#: Get rid of broken GetOption API and expose the "GetOptions()" method on descriptors instead
 2020-05-12 10:56:51 -07:00
Jon Skeet
807ea2f352 Fix to C# support library code 
(This was the only use of a HasXyz property for a message type.)
 2020-05-12 10:54:45 -07:00