Commit Graph

6329 Commits

Author SHA1 Message Date
Paul Yang
580e1890a6
Merge pull request #5766 from TeBoring/3.7.x-fix
Update version number to 3.7.0rc3
2019-02-22 14:53:16 -08:00
Bo Yang
b52754b719 Update version to 3.7.0rc3 2019-02-22 11:31:48 -08:00
Hao Nguyen
05f57125c3 Support rc version in update_version.py (#5750)
* Support rc version in update_version.py
2019-02-22 11:20:25 -08:00
Paul Yang
c7b3392201
Update version to 3.7.0 (#5749)
* Update version to 3.7.0

* Update version number for java bom
2019-02-19 15:54:45 -08:00
Paul Yang
688f7dee5a
Merge pull request #5738 from TeBoring/3.7.x-php-fix
Cherry-pick #5723 into 3.7.x
2019-02-19 10:46:08 -08:00
michaelbausor
3c387ea7e5 PHP: Exclude repeated and map fields from normalization in constructor (#5723)
* Exclude repeated and map fields from normalization

* Remove erroneous comments

* Remove unnecessary check for map type

* Add support for repeated/map fields, add tests

* Fix wrapper message in repeated/map fields in array constructor

* Address PR comments

* Removed unused code

* Update docs
2019-02-15 16:18:27 -08:00
Paul Yang
43f8ae8708
Fix oneof message in array constructor (#5727) 2019-02-14 08:57:12 -08:00
Adam Cozzette
9e381c05f5 Include compiler_config_setting.bzl in release tarballs (#5715)
This should fix #5696.
2019-02-12 14:13:32 -08:00
Paul Yang
4de1551696
Merge pull request #5708 from TeBoring/3.7.x-cherry-pick
Cherry-pick (#5686) to 3.7.x
2019-02-11 16:02:19 -08:00
Sydney Acksman
dbf77c65c4 Refactor how group endings are detected in generated C# code (#5686)
* Modify how end tags are encounted in merge code (compiler)

* Modify how end tags are encounted in merge code (generated)

* Modify how end tags are encounted in merge code (library)

* Regenerate generated code through generate_descriptor_proto.sh
2019-02-11 15:14:43 -08:00
Paul Yang
a1332ae3ce
RC release should use beta for api version (#5695) 2019-02-07 13:14:50 -08:00
Paul Yang
847ee580f2
Add config files for testing csharp artifact (#5683) 2019-02-05 17:28:04 -08:00
Paul Yang
5b4ac53c97
Add several fixes for python toolchain (#5667)
* Add several fixes for python toolchain

* Fix versin regex

* Make script exit on error

* Fix version regex

* Fix version regex

* Fix version regex

* Fix version regex

* Make test run on the current commit

* Fix test

* Fix test

* Use git to retrieve current commit

* Fix tests

* Fix tests

* Also make linux and mac work on the current commit

* Fix test
2019-02-01 18:43:55 -08:00
Paul Yang
15fc6401b6
Update php version number to 3.7.0RC2 (#5666)
* Update php version number to 3.7.0RC2

* Update version number in source code
2019-02-01 12:31:44 -08:00
Adam Cozzette
776b3a8b11 Fixed infinite recursion problem with Java GeneratedMessageV3 (#5657)
GeneratedMessageV3#setUnknownFieldsProto3 was trying to delegate to
setUnknownFields but was inadvertently resulting in infinite recursion.
This commit makes setUnknownFields and setUnknownFieldsProto3 delegate
to a common private method to fix the problem and avoid confusion.
2019-02-01 11:27:19 -08:00
Paul Yang
7d9377e7f3
Use gnu for ruby build because strptime is provided by posix (#5660)
* Use gnu for ruby build because strptime is provided by posix

* Move option to extconf.rb

* Remove unused code in Rakefile

* Add config files for kokoro test

* Use gnu 11

* Define _XOPEN_SOURCE

* Add gnu11 option

* Remove XOPEN

* Try base_cc_flags

* Try config_options

* Move time.h to top

* Try -D_XOPEN_SOURCE=700

* Define XOPEN_SOURCE directly

* Try extconf.rb

* Try CFLAGS

* Try ext.cross_config_options

* Make mac ruby release job fail on error

* Try again

* Try define _XOPEN_SOURCE in extconf.rb

* Try again

* Define __USE_XOPEN

* Remove 2.6.0

* No mingw

* Throw error on mingw

* Remove XOPEN_SOURCE in upb

* Add back mingw

* Remove comment
2019-02-01 10:09:34 -08:00
Adam Cozzette
1ee15baefc Updated version to 3.7.0rc2 2019-01-30 21:08:04 -08:00
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