AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
6,855 Commits 35 Branches 138 Tags 124 MiB
5021cd3419
Commit Graph

6855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomo Suzuki
30673ff200 backslash at the end of the comment 2019-06-27 08:45:04 -04:00
Hao Nguyen
de5a1fabab
Merge pull request #6308 from haon4/201906261101 
Down integrate to GitHub
 2019-06-26 16:39:17 -07:00
Hao Nguyen
e1d8b31ba4 Remove map_test.util.cc from BUILD 2019-06-26 15:02:11 -07:00
Tomo Suzuki
7051725941 To setup JDK8 2019-06-26 15:28:49 -04:00
ST-DDT
351a7cdf73
Follow line length guidelines 2019-06-26 20:43:39 +02:00
ST-DDT
5af81a442b
Use parameter name comment 2019-06-26 20:39:03 +02:00
Hao Nguyen
51026d9229 Down integrate to GitHub 2019-06-26 11:01:34 -07:00
Joshua Haberman
5bc250b084
Merge pull request #5878 from Parad0X/fix-ns 
Fix scope resolution for Google namespace
 2019-06-25 11:45:31 -07:00
Adam Cozzette
7e276a3293
Merge pull request #6300 from protocolbuffers/3.9.x 
Merge 3.9.x into master
 2019-06-24 16:15:15 -07:00
Paul Yang
3f33753f0f
Merge pull request #6298 from TeBoring/3.9.x-merge 
Merge master into 3.9.x
 2019-06-24 10:15:24 -07:00
Adam Cozzette
4aa77508a6 Added stubs/map_util.h to list of installed headers 
This should fix issue #6186. I also had to remove a couple unnecessary
const keywords in map_util.h because the no_warning_test was showing
errors about those.
 2019-06-21 16:17:09 -07:00
Bo Yang
d581c76063 Merge branch 'master' into 3.9.x 
Conflicts:
	java/lite/pom.xml
	java/util/pom.xml
 2019-06-21 20:31:00 +00:00
Paul Yang
54288a01ce
Rename get/setXXXValue to get/setXXXUnwrapped (#6295) 2019-06-21 13:25:23 -07:00
Paul Yang
b7a5772caf
Merge pull request #6292 from TeBoring/3.8.x-merge 
3.8.x merge
 2019-06-20 21:58:07 -07:00
Bo Yang
bc742640ef Merge remote-tracking branch 'origin/3.8.x' 2019-06-21 04:01:45 +00:00
Paul Yang
815ff7e1fb
Revert "Append field number to accessors if there is conflict (#6169)" (#6282) 
This reverts commit 9a8ef05a34.
 2019-06-20 20:59:48 -07:00
Hao Nguyen
093093fa91
Merge pull request #6176 from akonradi/patch-1 
Add extension number for protoc-gen-validate
 2019-06-20 11:18:53 -07:00
Hao Nguyen
0eb0aa5dc9
Merge pull request #6246 from JLLeitschuh/patch-1 
Compatibility tests pull artifacts over HTTPS
 2019-06-20 11:17:22 -07:00
Hao Nguyen
e992abd1f8
Merge pull request #6177 from cgrushko/master 
Add `protobuf_java_lite` Bazel target
 2019-06-20 11:15:08 -07:00
Alex Konradi
619ffac4f7
Merge branch 'master' into patch-1 2019-06-20 14:10:06 -04:00
Yun Peng
6e58040a71 Add "src/**/*.inc" to //:protobuf_headers 
Otherwise, sandbox and remote execution will complain `google/protobuf/port_def.inc` doesn't exist.
 2019-06-19 09:25:52 -07:00
Paul Yang
7f84a94366
Make php message class final to avoid mocking (#6277) 
* Make php message class final

Because proto messages are just data object, they should not be mocked.
Explicitly make them final to avoid accidental usage.

* Update generated descriptors
 2019-06-18 17:12:55 -07:00
Joshua Haberman
98f0447a6f
Merge pull request #6274 from haberman/objc 
Removed all use of STLDelete*() in ObjC and C# Generators.
 2019-06-18 15:07:36 -07:00
Hao Nguyen
d3e6f10768
Merge pull request #6276 from acozzette/protobuf-deps-bzl 
Include protobuf_deps.bzl in generated release archives
 2019-06-18 12:20:45 -07:00
Leonard Hecker
43307d4da0 php: Fix formatting of Duration (#6155) 
* php: Fixed php notices for unknown enum indices

* php: Fixed formatting of Duration

This fixes:
* Missing nanoseconds. The nanoseconds where divided as a float and
  implicitly converted to a string before being passed to bcadd.
  This can result in a float formatted in scientific/exponential notation,
  which bcmath doesn't understand.
* Durations are supposed to be formatted without trailing zeroes.
 2019-06-18 10:31:50 -07:00
Adam Cozzette
21773efa23 Include protobuf_deps.bzl in generated release archives 
This fixes #5918.
 2019-06-18 10:07:18 -07:00
Adam Cozzette
1f0d8172da Revert "JSON string output funtions should clear() the destination first" 
We found that some code depended on the behavior of appending to the
string without clearing it first. The comments in json_util.h also make
it appear that the appending behavior is intentional, so I think we need
to stick with the old behavior.

This reverts commit 3cbe45a4b5.
 2019-06-18 09:43:50 -07:00
Joshua Haberman
f98b3401bf Removed all use of STLDelete*() in ObjC and C# Generators. 
Other languages will have this removed inside Google first.
These functions are subject to ADL and cause problems.
 2019-06-18 00:45:53 -07:00
Hao Nguyen
b97b623d7b
Merge pull request #6270 from haon4/update_generated_codes 
Update generated codes
 2019-06-17 16:24:37 -07:00
Hao Nguyen
f2a919f58f
Merge pull request #6268 from haon4/java_gson_update 
Update GSON version to 3.8.5
 2019-06-17 14:06:58 -07:00
Hao Nguyen
ef5e8f4aa7 Update C# generated proto file 2019-06-17 14:05:40 -07:00
Hao Nguyen
b0a9d63b53 Update version on type.pb.h 2019-06-17 14:02:29 -07:00
Hao Nguyen
8ccdc44dde Update GSON version 2019-06-17 13:20:44 -07:00
Paul Yang
640423f157
Change int64 json encoding to be string for php and ruby (#6251) 
* Change int64 json encoding to be string for php and ruby

* Fix ruby test

* Sync upb change
 2019-06-17 13:14:27 -07:00
Paul Yang
abb4fb0040
Change offset of Timestamp conformance test to distinguish from the default (#6263) 
Fixes #4079
 2019-06-17 13:13:54 -07:00
Paul Yang
444354f41a
Update gem to 2.7.9 (#6265) 
New bundler doesn't work with old gem: https://github.com/rbenv/rbenv/issues/1138
 2019-06-17 09:53:12 -07:00
Hao Nguyen
003f94c269
Merge pull request #6266 from haon4/3.9.x 
Update version to 3.9.0
 2019-06-17 09:49:23 -07:00
Hao Nguyen
638720274b Update version to 3.9.0 2019-06-17 09:34:50 -07:00
Sorah Fukumori
997bd354d5 Fix TypeError on decoding enum map values in Ruby (#6262) 
value_field_typeclass should be a enum module, not EnumDescriptor
object.

Also expanding tests for enum valued maps.

Fixes #4580

Signed-off-by: Sorah Fukumori <her@sorah.jp>
 2019-06-16 15:20:18 -07:00
ST-DDT
73e0d748b9
Switch to using enum based methods 2019-06-15 20:31:31 +02:00
Hao Nguyen
e5f246d3a8
Merge pull request #6250 from haon4/csharp_remove_fields 
Remove unused fields
 2019-06-13 12:09:57 -07:00
Hao Nguyen
bb1c0adedf Remove unused fields 2019-06-12 12:32:51 -07:00
Benjamin Peterson
310ba5ee72 Treat plugins as host tools. 
As a followup to ca3ead7745, treat plugin executables as well as protoc as host tools.
 2019-06-12 10:00:36 -07:00
Keith Smiley
ce0dca83ab Move tool out of inputs in bazel config 
This fixes compatibility with bazel when passing `--incompatible_no_support_tools_in_action_inputs` which will be flipped in an upcoming release.
 2019-06-12 10:00:36 -07:00
Hao Nguyen
61301f0155
Merge pull request #6245 from haon4/201906111559 
Down Integrate to GitHub
 2019-06-12 06:03:41 -07:00
Jonathan Leitschuh
8147e7db8a
Compatibility tests pull artifacts over HTTPS 2019-06-11 22:23:37 -04:00
Hao Nguyen
09cab821a9 Down integrate to GitHub 2019-06-11 16:00:16 -07:00
Hao Nguyen
b008801b5d
Merge pull request #6237 from haon4/silent 
Enabling silent mode by default to reduce make compilation noise
 2019-06-11 10:07:39 -07:00
marwan-at-work
36cd11a2bf Add twirpql ID to global registry 2019-06-11 07:34:41 -07:00
John W. Bruce
21e4b1c336 Fix Alphabetization of BUILD 2019-06-10 20:52:51 -07:00