Commit Graph

6312 Commits

Author SHA1 Message Date
Adam Cozzette
650915742d Updated pom.xml files
The Nexus repository now seems to require SCM and developer information
to be present in the POM file.
2019-01-30 13:25:58 -08:00
Adam Cozzette
02557977bb Include Linux ppcle_64 builds and Windows 64-bit builds of protoc 2019-01-30 13:25:58 -08:00
Adam Cozzette
0e3f1f4ad7 Fixed Javadoc errors 2019-01-30 13:25:58 -08:00
Paul Yang
74f667ddc2
Merge pull request #5644 from TeBoring/fix-4765
Convert integer to string if field is string field in json
2019-01-28 15:15:59 -08:00
Bo Yang
8400e29044 Divide commands into separate lines 2019-01-28 20:58:58 +00:00
Bo Yang
71e5de01d3 phpunit-5.6.10 link is broken
Use 5.6.8 instead
2019-01-28 20:57:51 +00:00
Bo Yang
96029f3c4a Convert integer to string if field is string field in json
json_decode automatically convert numeric string to integer, so that
we need to convert it back. However, this will suceed to parse invalid
json data with string field set as integer even though it should have failed.
Because, the failure case is less often than the succeeding case, we decided
to make this change. Users should make sure their data don't use integer for
string fields by themselves.
2019-01-28 20:57:51 +00:00
Paul Yang
32339be92a
Merge pull request #5646 from TeBoring/3.7.x-cherrypick
Default values should also be serialized for json map key/value (#5643)
2019-01-28 12:48:54 -08:00
Paul Yang
3cae8e4467 Default values should also be serialized for json map key/value (#5643) 2019-01-28 19:30:10 +00:00
Paul Yang
a73b43593d
Merge pull request #5640 from TeBoring/3.7.x-cherrypick
cherrypick changes from master
2019-01-28 11:29:47 -08:00
Hao Nguyen
c143164986 Fix MacOS protoc release (#5638)
* Use set -ex
* Use -std=c++14 so -latomic can be found
2019-01-27 19:53:31 +00:00
Hao Nguyen
532c42586f Fix python release build. (#5636)
* Fix python release build.
* Separate config.sh by platform
* Use KOKORO_JOR_NAME to determine the BUILD_COMMIT.
* Use -std=c++14 on MacOS so -latomic can be used.
2019-01-27 19:53:14 +00:00
Paul Yang
53a1d49633
Allow internalAddGeneratedFile to depend on new nested message name (#5629)
Previously, internalAddGeneratedFile has to depend on old non-nested name for sub-messages.
This creates a hard dependency on old generated code for compatibility usage.
If user's code has custome error handler, the deprecation warning in the old generated code
will also be thrown (even though users haven't explicitly depended on the old message name).

To fix this problem, this change added an additional flag in the generated code to tell run
time that it's safe to use new message name. In this way, internalAddGeneratedFile can safely
depend on new name and don't trigger unnecessary deprecation warning.
2019-01-24 19:10:00 -08:00
Hao Nguyen
dab6a7ea98
Merge pull request #5631 from haon4/update-changes
Update CHANGES.txt
2019-01-24 14:46:25 -08:00
Hao Nguyen
6b434dc6e2 Update CHANGES.txt 2019-01-24 14:35:47 -08:00
Hao Nguyen
cc83bf7aac
Merge pull request #5626 from haon4/3.7.x
Update version to 3.7.0
2019-01-24 12:11:57 -08:00
Hao Nguyen
9e60cd785b Update generated codes 2019-01-24 11:32:07 -08:00
Hao Nguyen
7187cfd275 Update version number in java/bom/pom.xml 2019-01-24 11:20:14 -08:00
Hao Nguyen
15605fcd20 Include version change for src/google/protobuf/port_def.inc 2019-01-24 11:08:58 -08:00
Hao Nguyen
d5be2baa46 Update version to 3.7.0 2019-01-24 10:23:02 -08:00
Paul Yang
38d9ca47db
Merge pull request #5618 from TeBoring/3.7.x-merge
Merge new changes into 3.7.x
2019-01-23 17:31:17 -08:00
Bo Yang
dbfb9a8a07 Merge branch 'master' into 3.7.x 2019-01-23 12:49:53 -08:00
Paul Yang
d750fbf648
Fix more issues for reference values (#5613)
* Fix more issues for reference values

* Revert change in gdb test

* Add more tests
2019-01-23 12:44:20 -08:00
Hao Nguyen
30851ca266
Fix protoc release (#5615)
* Fix protoc release

* Update Dockerfile to include libatomic
2019-01-23 10:55:36 -08:00
Hao Nguyen
4f8a635679
Create test for protoc with tcmalloc (#5612)
* Add TC malloc kokoro test

* Update tcmalloc test
2019-01-23 10:02:51 -08:00
Paul Yang
7f42d6d0bc
Fix empty FieldMask json encoding/decoding (#5605)
* Fix empty FieldMask json encoding/decoding

* Add failed test to python's conformance failure list
2019-01-22 15:35:12 -08:00
Paul Yang
1069565a68
Fix c extension doesn' allow message reference in array (#5599)
* Fix c extension doesn' allow message reference in array

* Fix array constructor handling reference of array.

* Change test name
2019-01-22 14:02:44 -08:00
Adam Cozzette
a4c09f3eba
Merge pull request #5590 from i9/patch-1
Add proto3 to solidity link in third_party.md
2019-01-18 15:57:42 -08:00
Joshua Haberman
dd7127d23d Fixed compile warnings for PHP extension. (#5589)
* Fixed compile warnings for PHP extension.

* Fixed some compile errors on PHP <7 and with TSR enabled.

* One more fix for TSRM builds.
2019-01-18 15:05:57 -08:00
Joshua Haberman
6bbd2fc5aa
Merge pull request #5603 from protocolbuffers/revert-5597-patch-1
Revert "doc: apply consistent indentation to Any examples"
2019-01-18 13:51:57 -08:00
Paul Yang
4e929031b0 Revert "doc: apply consistent indentation to Any examples (#5597)"
This reverts commit b3367aee14.
2019-01-18 12:54:23 -08:00
bitspill
b3367aee14 doc: apply consistent indentation to Any examples (#5597) 2019-01-17 17:13:31 -08:00
Paul Yang
37a0ab7d83
Fix Any json encoding/decoding for ruby. (#5592)
* Fix Any json encoding/decoding for ruby.

* Revert unnecessary changes
2019-01-17 10:24:41 -08:00
Paul Yang
c4f2a92c55
Fix field mask for php in json (#5591)
* Fix field mask for php in json

* Update byte size
2019-01-17 10:18:43 -08:00
i9
7181b1c090
Add proto3 to solidity link
pb3-gen-sol is a proto3 to solidity library generator that supports proto3 native types and uses field option for solidity native types. Both the message and generated code are more efficient than other solutions. It also includes a library to decode protobuf wireformat.
2019-01-16 19:47:12 -08:00
toc007
dda7ab0363 Ruby nested msg caps (#5564)
* Ruby nested msg caps

* nested types tests added

* test cases added for RubifyConstant

* extracted NestedMessage to TestNestedMessage

* removed nested tests with leading underscore

* extracted testLowercase to toplevel testLowercaseNested
2019-01-15 20:01:41 -08:00
Thomas Van Lenten
0c95791509 [ObjC] add support for the TextFormat constants.
ObjC doesn't support them, but this ensure when tests are added
they will be handled correctly.

The conformance.proto was updated in PR #5566
2019-01-14 11:03:16 -05:00
Sam Saccone
94a1819c7a Remove unused f expression from jscode gen. (#5573)
Varadic assignment in javascript where the right hand expression is an
object yields a single set assignment with the right most lefthand variable,
while leaving the other left side expressions undefined.

For example:
var a,b = {}

will only initialize a to undefined. But will set b to the {} value.

--

For this code since f is never used, it is a safe operation to remove
it.
2019-01-13 18:25:16 -08:00
Yilun Chong
a2a0afb546
Down-integrate internal changes to github. (#5575)
* Down-integrate internal changes to github.

* Fix BUILD file and regenerate csharp descritpor
2019-01-13 17:40:58 -08:00
Nicolás Elliott
54683e607b Fix Issue #5345 (#5381)
Added a few \ on the comments to match the exceptions scope when is referenced while in a namespace. So the IDEs can be happy.
2019-01-12 10:25:07 -08:00
Yilun Chong
cb95a7f6a8
Down-integrate internal changes to github. (#5566)
* Down-integrate internal changes to github.

* fix csharp conformance test

* add comments in conformance.proto for text format

* fix comments

* fix comments, re-generated csharp file

* fix comments, re-generated csharp file
2019-01-11 11:40:52 -08:00
Thomas Van Lenten
b1b9eaa6c7 Comments on the next line will go to the next field.
Even though the comments were indented to appear to go with the jspb
case/field, protoc doesn't collect comments like that, so these "hanging"
comments actually "attach" to the next thing added to each.  Looking at
https://github.com/protocolbuffers/protobuf/pull/5566 you see where
the generated code picked up the comment on the wrong field.
2019-01-10 13:14:21 -05:00
Yilun Chong
0adb74c2d3 Down-integrate internal changes to github. (#5555)
* Down-integrate internal changes to github.

* fix python conformance test

* fix csharp conformance test

* add back java map_lite_test.proto's optimize for option

* fix php conformance test
2019-01-08 15:06:30 -08:00
Paul Yang
11c979b591
Fix Empty ListValue/Struct json encoding (#5532)
* Fix Empty ListValue/Struct json encoding

* Add test for empty ListValue
2019-01-08 14:11:33 -08:00
Paul Yang
aa5c12e882
Revert "Revert "Enable the ignore_unknown_field option in the Ruby unmarshal options" (#5511)" (#5533)
* Revert "Revert "Enable the ignore_unknown_field option in the Ruby unmarshal options" (#5511)"

This reverts commit be1716a6d0.

* Separate ruby conformance test on Mac

* Fix shell syntax

* Fix test
2019-01-08 10:53:34 -08:00
Thomas Van Lenten
bd00671b92 ObjC: Add a Xcode project for tvOS.
The CocoaPod (and source) have always support tvOS, but adding the project
makes it easier to run the tests and debug if there ever were an issue.

(not adding a watchOS project at the moment because Apple doesn't provide
 XCTest, so all it could do is build the library. We still support that,
 just can't "test" it.)
2019-01-08 08:22:12 -05:00
Thomas Van Lenten
f56adaeb57 Remove stale target reference. 2019-01-08 08:22:12 -05:00
Paul Yang
c3340b20a8
Add ruby 2.6 gem build for linux (#5537)
* Add ruby 2.6 gem build for linux

* Add docker hub organization

* Add ruby2.6 in cross compile targets

* Fix tests

* Check mac version

* No need to install php in preparation for mac
2019-01-07 19:44:54 -08:00
Thomas Van Lenten
24d344c30c [ObjC] Add the jspb cases to the switches so they are complete. 2019-01-07 17:38:20 -05:00
Paul Yang
de9e1a04a6
Add ruby 2.6 test (#5528)
* Add ruby 2.6 test

* Fix broken tests

* Fix compatibility test

* Fix bundler version

* Use new docker image

* Fix broken test

* Use new docker image in ruby26 test

* Install ruby for mac
2019-01-03 14:25:50 -08:00