Commit Graph

6358 Commits

Author SHA1 Message Date
Adam Cozzette
077079573f Fixed CI failures with Ruby 2.3 on OSX (#5948)
OSX has deprecated OpenSSL, so we need to install it via Homebrew and
build against that version when we build Ruby.
2019-03-25 17:19:48 -07:00
Adam Cozzette
34b64995ac Avoid linking against libatomic when building protoc (#5922)
We ran into problems with precompiled protoc binaries not working on
some systems because of the dependence on a dynamically linked
libatomic. However, I found that linking against libatomic is not
actually necessary in our protoc build environment. Inside configure.ac
there's a test which figures out if we need to pass -latomic, and it
does this by attempting to build a test binary. That binary was failing
to build, but it turns out this was because we need to pass -std=c++11,
not -latomic.

This fixes #5875.
2019-03-25 11:00:19 -07:00
Paul Yang
ba42cb53d9
Allow bytes field to be longer than 16000 bytes (#5924)
* Allow bytes field to be longer than 16000 bytes

* Remove empty line
2019-03-25 10:51:18 -07:00
Adam Cozzette
02cf61a7da Updated NPM version to 3.7.1 2019-03-25 09:52:46 -07:00
myd7349
ec0d47e4d2 No define strtoll/strtoull for VS2013 and above 2019-03-25 09:52:00 -07:00
Adam Cozzette
b3c132f6f3 Avoid marking generated C++ messages as final for now (#5928)
We need to mark messages as final soon, but before we do that we need to
provide a temporary opt-out mechanism to accommodate existing code that
inherits from generated messages. For 3.7.1 let's stop marking messages
final but in 3.8 we can reintroduce "final" with an opt-out option.
2019-03-25 09:37:06 -07:00
Daniel Kurka
059851fe59 Remove unused import from message. 2019-03-21 15:11:56 -07:00
Daniel Kurka
e2461b5f59 Revert "Remove unused f expression from jscode gen. (#5573)"
The removed variable here is actually used breaking downstream bazel
builds.
2019-03-21 14:35:25 -07:00
Adam Cozzette
e6779e9b2a Added io_win32.h to header list in CMake config
This should fix #5717 and ensure that this header gets installed
properly on Windows.
2019-03-21 10:30:37 -07:00
Paul Yang
57b6597f46
Replace strptime with custom implementation (#5906)
* Replace strptime with custom implementation

* Fix ruby strptime

* Fix test

* Fix ruby conformance test

* Use mktime

* Remove EmptyFieldMask from failed conformance test list
2019-03-19 22:27:13 -07:00
Paul Yang
032a179e47
Fix macros in header of generated code (#5881)
* Fix macros in header of generated code

* Define PROTOBUF_MIN_PROTOC_VERSION in port_def.inc
* Remove duplicated GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION from common.h

* Send error if the error has been defined

* Undef the new macro
2019-03-15 11:17:23 -07:00
Paul Yang
4fd0579e47
Merge pull request #5896 from jbolinger/error-to-3.7.x
Ruby error messages in 3.7.x
2019-03-14 22:21:17 -07:00
Joe Bolinger
580826cd97 cherry-pick test fix from #5853 2019-03-14 16:32:01 -07:00
Joe Bolinger
604121aaa4 fix tests for older rubies 2019-03-14 11:42:22 -07:00
Joe Bolinger
1cf730cb22 add type errors test to Makefile.am 2019-03-14 11:37:39 -07:00
Joe Bolinger
0114727cc6 add more descriptive error messages to init methods 2019-03-14 11:37:39 -07:00
David Supplee
d65b8647f2 Add terminating character to zend_lookup_class call (#5871) (#5885)
* add terminating character

* adjust name length input

* add test cases

* correct script name

* Misc fixes

* add new script to EXTRA_DIST list
2019-03-13 13:31:55 -07:00
Paul Yang
207d01daa1
Remove GPBWrapperUtil from generated code (#5880)
* Remove GPBWrapperUtil from generated code

* Add newline
2019-03-12 22:33:13 -07:00
Paul Yang
4b145b1c7f
Parse nested listvalue in json for ruby (#5867)
* Add conformance test for nested listvalue

* Fix upb for parsing repeated Value/ListValue

* Add failed repeated ListValue conformance test into php failure list
2019-03-12 10:56:58 -07:00
Adam Cozzette
45aba801ed Avoid passing -Og flag to C++ compiler
It appears that some versions of Clang do not support this flag, and
this came up as a problem for Homebrew builds in issue #5815.
2019-03-12 10:15:50 -07:00
Paul Yang
a18680890b
Encode empty ListValue (#5857)
* Encode empty ListValue

* Update mac ruby conformance failure list
2019-03-10 17:33:46 -07:00
David Ostrovsky
4b9a5df4e8 Bazel: Add dependency to error_prone_annotations
Recently dependency to error_prone_annotations was added to the code,
but only Maven build tool chain was updated.

Closes #5795.
2019-03-08 12:54:49 -08:00
bmoyles0117
0b5111dbab Raise error for JSON overflow encoding in Ruby (#5752) (#5861)
* add check for overflow

* de-nestify

* break long lines
2019-03-08 12:50:33 -08:00
Paul Yang
582743bf40
Update version number to 3.7.0 (#5793)
* Update version number to 3.7.0

* Add php/releash.sh to Makefile.am

* Make cpp_distcheck exit on fail
2019-02-28 12:55:14 -08:00
Yilun Chong
6eeab29468
Merge pull request #5787 from BSBandme/3.7.x-fix
Cherry-pick fixing for mac tests after kokoro updates
2019-02-26 16:34:49 -08:00
Yilun Chong
603020940a fix mac python cpp building (#5786) 2019-02-26 15:51:15 -08:00
Yilun Chong
400845ae17 fix macos build for High Sierra (#5780)
* fix macos build by changing xcode version

* add comments

* fix benchmark build for mac

* fix for gem option and install npm

* add test for node and npm

* fix node

* fix for node

* another attempts to fix node

* another attempts

* clean up
2019-02-26 15:51:04 -08:00
Paul Yang
0aad5339ca
Add a script to mirror php changes to protobuf-php (#5778)
* Add a script to mirror php changes to protobuf-php

* Create tag
2019-02-26 09:25:37 -08:00
Paul Yang
5d8cd3b895
Date and time need to be before version (#5777) 2019-02-25 15:13:59 -08:00
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