Commit Graph

6664 Commits

Author SHA1 Message Date
Alex Konradi
619ffac4f7
Merge branch 'master' into patch-1 2019-06-20 14:10:06 -04: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
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
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
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
8ccdc44dde Update GSON version 2019-06-17 13:20:44 -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
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
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
Hao Nguyen
61301f0155
Merge pull request #6245 from haon4/201906111559
Down Integrate to GitHub
2019-06-12 06:03:41 -07: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
Hao Nguyen
f158dfe3a9 Add AM_SILENT_RULES([yes]) to configure.ac 2019-06-10 16:49:58 -07:00
Joshua Haberman
8041dd4034
Merge pull request #6166 from blowmage/ruby-remove-to_hash
[Ruby] Remove to_hash methods
2019-06-10 16:02:19 -07:00
Lily Li
a1b3d5e1b9 add compatibility check badges to README 2019-06-10 14:40:51 -07:00
boscosiu
3cbe45a4b5 JSON string output funtions should clear() the destination first
Make the JSON util string output functions match the Message::SerializeToString() behavior.  This is helpful when packing the output into string fields of reused protobuf messages.
2019-06-10 14:35:39 -07:00
Benjamin Peterson
6153f80876 Treat plugins as host tools.
As a followup to ca3ead7745, treat plugin executables as well as protoc as host tools.
2019-06-06 12:48:55 -07:00
Thomas Van Lenten
a8b8c037fc Add Xcode 11 support to the script. 2019-06-06 15:29:59 -04:00
Thomas Van Lenten
1c8a7a10f8 Update some tests for newer clang error messages. 2019-06-06 15:29:59 -04:00
Julien Poumailloux
1c95097dd3 ObjC: avoid assign for object properties (part 2)
Follow up on https://github.com/protocolbuffers/protobuf/pull/6221
2019-06-06 13:42:44 -04:00
Andrzej Hunt
4e740a724f ObjC: avoid assign for object properties
This avoids hitting the following warning when including GPBDescriptor.h in ARC
projects with stricter warning settings:
error: 'assign' property of object type may become a dangling reference; consider using 'unsafe_unretained' [-Werror,-Wobjc-property-assign-on-object-type

We first hit this in XCode 11, it's unclear whether it simply got stricter about
enforcing this warning or whether the flags enabled with -Wall or -Weverything
have been expanded.
2019-06-06 10:17:42 -04:00
Carlos O'Ryan
b10d490efd Fix RPATH when CMAKE_INSTALL_LIBDIR != lib.
In some platforms ${CMAKE_INSTALL_LIBDIR} expands to `lib64`. The libraries
are correctly installed in that directory, but the RPATH is set to point to
`$ORIGIN/../lib`, where it should be `$ORIGIN/../lib64`.
2019-06-05 10:39:02 -07:00
Wang Kirin
e08f01ce6a compelete fix issue 5060: change CodedOutputStream to CodedOutputStream* 2019-06-04 17:00:22 -07:00
Hao Nguyen
77f03d932a
Merge pull request #6201 from haon4/3.8.x-201905311515
Merge 3.8.x into master branch
2019-06-01 11:27:57 -07:00
Steven Peters
232d061743 remove comment about wire_format_lite_inl.h
The wire_format_lite_inl.h header file was made unnecessary in #5839
and deleted in #5921, so remove the comment about it.
2019-05-31 15:46:04 -07:00
Hao Nguyen
ca7ae5215f
Merge pull request #6202 from haon4/update_contributing
Update CONTRIBUTING.md to clarify who should set the labels
2019-05-31 15:43:09 -07:00
Hao Nguyen
e06c5ff780 Update CONTRIBUTING.md 2019-05-31 15:32:02 -07:00
Hao Nguyen
634d704d23 Merge branch '3.8.x' into 3.8.x-201905311515 2019-05-31 15:18:39 -07:00
Wang Kirin
74f4f594cf fix typos in examples/README.md 2019-05-31 14:26:20 -07:00
Hao Nguyen
da5d02bced
Merge pull request #6199 from haon4/201905301330
Down integrate to GitHub
2019-05-31 09:53:51 -07:00
Hao Nguyen
010320f780 Add dependency to truth in test 2019-05-31 07:54:53 -07:00
Hao Nguyen
0a67788a46 Include the new Java util files in Makefile.am 2019-05-31 06:26:08 -07:00
Hao Nguyen
044c766fd4 Down integrate to GitHub 2019-05-30 13:31:15 -07:00
Thomas Van Lenten
beaeaeda34 Use runtime_error vs just exiting for some issues.
release notes: no
2019-05-29 15:58:09 -04:00
Amit Portnoy
37297b25f6 avoid error when compiling with MSVC2010
I'm getting `src/google/protobuf/map_field.cc(284): error C2899: typename cannot be used outside a template declaration`

removing `typename` fixes the issue
2019-05-28 11:09:41 -07:00
Keith Smiley
ca3ead7745 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-05-28 10:46:14 -07:00
Hao Nguyen
09745575a9
Merge pull request #6160 from haon4/3.8.x-20190521140707
Update protobuf version to 3.8.0
2019-05-24 11:06:49 -07:00
Hao Nguyen
303191d892
Merge pull request #6173 from haon4/cherrypick_fix_build
Fix gulpfile to use gulp 4 API
2019-05-24 10:12:57 -07:00
Paul Yang
95c207f24e
Add use_nested to internalAddGeneratedFile for php implementation (#6117) 2019-05-24 10:01:58 -07:00
Paul Yang
9a8ef05a34
Append field number to accessors if there is conflict (#6169)
Previously, foo_value and foo (wrapper field) will both have get/setFooValue
2019-05-24 10:00:09 -07:00
Alex Konradi
b44a1364ec
Add extension number for protoc-gen-validate
This project is used by the [Envoy proxy](https://www.envoyproxy.io/) and several others.

The existing code is using the extension value [919191](54b08a686f/validate/validate.proto (L29)) but since maintaining binary compatibility is not important, it shouldn't be a problem to change once this allocation is approved.
2019-05-24 07:44:51 -04:00
Hao Nguyen
f9cd7bd9b3 Upgrade gulp version 2019-05-23 16:31:06 -07:00
Hao Nguyen
6d83327a86 Fix gulpfile to use gulp 4 API 2019-05-23 15:24:02 -07:00
Hao Nguyen
affe9c200a
Merge pull request #6161 from haon4/201905211601
Down integrate to GitHub
2019-05-22 14:30:49 -07:00
Hao Nguyen
e038b1e7c0
Merge pull request #6164 from haon4/cherrypick_fix_build
Cherrypick 014872a962 to fix build
2019-05-22 13:55:48 -07:00
Mike Moore
565154af78
Remove Ruby to_hash methods 2019-05-22 13:21:51 -06:00