Feng Xiao
5248f61a34
Force a rebuild of Jenkins docker image.
...
Needed to pick up a Java dependency change and re-populate the offline
repo.
[skip ci]
2016-09-23 17:35:23 -07:00
Feng Xiao
3c88e1b53d
Fix VS test failures.
2016-09-23 16:53:01 -07:00
Feng Xiao
c454b44335
Merge pull request #2171 from xfxyjwf/fix_json
...
Reduce test length to avoid stack overflow on VS.
2016-09-23 16:50:42 -07:00
Feng Xiao
73c8723266
Use "appveyor DownloadFile"
...
"ps: StartFileDownload" is broken by a recent appveyor image update:
http://help.appveyor.com/discussions/problems/5308-ci-frequently-hangs-with-recent-image-update
Change-Id: Ia73aa8b12f77eb9bbec556a4c05310153aad97bf
2016-09-23 16:04:38 -07:00
Bo Yang
18f336b98a
Update php supported version.
2016-09-23 22:22:18 +00:00
Feng Xiao
f6b4d188b4
Reduce test length to avoid stack overflow on VS.
2016-09-23 21:45:03 +00:00
Bo Yang
411968d01f
Fix python cpp.
2016-09-23 21:38:35 +00:00
Feng Xiao
37c3d05f57
Merge pull request #2167 from xfxyjwf/fix_vs
...
Fix Visual Studio compile issues.
2016-09-23 12:11:04 -07:00
Feng Xiao
0798d91f55
Fix Visual Studio compile issues.
...
Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
2016-09-23 11:55:26 -07:00
Jisi Liu
3bfc09d548
Merge pull request #2170 from pherl/3.1.x
...
Fix default instance destructor and memory leaks
2016-09-23 11:29:21 -07:00
Jisi Liu
f184cb6035
Fix default instance destructor
2016-09-23 11:17:00 -07:00
Jisi Liu
34996c31b7
Merge branch '3.1.x' of github.com:google/protobuf into 3.1.x
2016-09-23 11:14:37 -07:00
Bo Yang
8c88762e3e
Update version number.
2016-09-22 19:24:19 -07:00
Bo Yang
94bbeb4681
Bump library version to 11
2016-09-22 18:10:00 -07:00
Bo Yang
1b7a844fa1
Add back removed descriptor field.
2016-09-22 18:04:02 -07:00
Bo Yang
9cb812fab5
Modify php api version and minimum supported php version.
2016-09-22 17:17:01 -07:00
Stanley Cheung
11433f78a7
PHP: support 7.0 on PHP implementation ( #2162 )
...
* PHP: support 7.0
* Also fix in test_util.php
2016-09-22 17:13:12 -07:00
Jisi Liu
39a2a25f05
update files to include php generators ( #2165 )
2016-09-22 17:13:11 -07:00
Feng Xiao
2649844cab
Update version number.
...
[skip ci]
Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
2016-09-22 17:13:11 -07:00
Feng Xiao
5270e93803
Fix java compatibilty tests.
...
Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
2016-09-22 17:13:11 -07:00
Jisi Liu
923314cc88
update files to include php generators
2016-09-22 15:11:17 -07:00
Charlene
8352d52dd8
Update minimum support php version to 5.5
2016-09-21 21:03:30 -07:00
Bo Yang
bee5213b00
Fix bugs for internal integration.
2016-09-22 01:04:02 +00:00
Brendan Ribera
525c6327ab
Fix hash computation for JRuby's RubyMessage
...
`System.identityHashCode` returns a hash that does not consider a
Message's values. This means two Messages with identical values will not
have identical hashCodes.
This patch uses the pattern from RubyMap to combine the hashCodes from
all values in a given message and produce a unique, consistent,
value-based hash.
2016-09-22 00:18:12 +00:00
Bo Yang
b8e7e892c8
Fix travis, jenkins environment issues.
2016-09-21 22:56:47 +00:00
Adam Cozzette
050c014ac6
Added new has_bits.h file to cmake/extract_includes.bat.in ( #2152 )
...
This is necessary so that the CMake build knows to include this header
file in the installation include/ directory.
2016-09-21 10:40:26 -07:00
Adam Cozzette
f81d44fafa
Fixed quadratic behavior in JSPB deserialization of repeated fields ( #2117 ) ( #2146 )
...
Currently deserialization of a non-packed binary repeated field is quadratic in
the number of elements, because each time we parse a new element we copy over
all elements we have parsed so far. This CL fixes the performance problem by
having the generated deserialization code just call addX() instead of using
getX() and setX().
2016-09-21 10:39:23 -07:00
Bo Yang
b9bc9904c2
Fix bugs for csharp and ruby for internal integration.
2016-09-21 02:20:24 +00:00
Bo Yang
c8b9d41f99
Fix python bugs for internal integration.
2016-09-21 01:34:32 +00:00
Bo Yang
08e9f7011b
Bump library veriosn to 3.1
2016-09-21 00:38:58 +00:00
Bo Yang
22d7248c97
Fix bugs for internal integration.
2016-09-20 23:54:13 +00:00
Bo Yang
6cb6bd9f21
Fix gson dependency.
...
gson 2.3 has internal bug that it doesn't work with some versions of maven.
2016-09-20 22:04:48 +00:00
Bo Yang
ebcda12102
Bump version number to 3.1.0-alpha-1.
2016-09-20 21:37:06 +00:00
Joshua Haberman
679381fba8
Fix for maps_test.js in JavaScript. ( #2145 )
...
Had to strip out some JSPB-format test code,
but also added some .proto test messages that
had been improperly stripped out.
2016-09-20 13:56:18 -07:00
Bo Yang
a2c65011c3
Fix bugs for internal integration.
2016-09-19 20:40:58 -07:00
Thomas Van Lenten
0dca5a5bf9
Use a custom dictionary to avoid NSNumber operations.
...
For the secondary dictionary, use a custom CFDictionary with integer keys to
avoid the NSNumber conversions.
2016-09-19 17:43:19 -07:00
Thomas Van Lenten
96c469de68
Remove the custom key functions and just use the system provided defaults.
2016-09-19 17:43:19 -07:00
Bo Yang
98835fb8f8
Integrate internal changes
2016-09-19 17:42:40 -07:00
Joshua Haberman
b5bbdb0967
Merge pull request #2037 from abscondment/fix-2036-ruby-hash
...
Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
2016-09-18 21:38:51 -07:00
Feng Xiao
c44ca26fe8
Merge pull request #2130 from kilink/substring-comment-fix
...
Fix erroneous comment regarding String.substring
2016-09-16 17:07:57 -07:00
Patrick Strawderman
9ac84f8f3f
Fix erroneous comment regarding String.substring
...
Since Java 7, Strings produced with String.substring do not share byte arrays.
2016-09-16 14:54:58 -07:00
Bo Yang
3b001ca6ba
Some php engine implementation doesn't have return_value_ptr properly set. Explicitly use &return_value.
2016-09-15 17:59:49 -07:00
Bo Yang
c6fa9c71a5
Auto-generate proto files for tests.
2016-09-15 17:59:49 -07:00
Bo Yang
f174d36380
Add back missing test proto files.
2016-09-15 17:59:49 -07:00
Jisi Liu
9c4be5f654
Merge pull request #2112 from pherl/merge
...
Merge 3.0.x into master
2016-09-15 14:37:38 -07:00
Thomas Van Lenten
b4235ac79c
Merge pull request #2123 from thomasvl/objc_better_versioning_take2
...
Update the ObjC version checks to support a min and current version.
2016-09-15 17:36:08 -04:00
Thomas Van Lenten
1aa6500056
Update the ObjC version checks to support a min and current version.
...
- Capture the version used to generated.
- Check at compile time and runtime that generated code isn't from a newer
version, also check that the min version required is also supported.
- Keep the old constants/macros/functions to special case the last version
that was working so those generated sources still work until we decide
otherwise.
2016-09-15 17:22:51 -04:00
Paul Yang
e0e54661f7
Check in php implementation. ( #2052 )
...
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Jisi Liu
58860c021f
Merge remote-tracking branch 'origin/3.0.x' into merge
2016-09-14 09:37:48 -07:00
Feng Xiao
86fcd879b3
Merge pull request #1765 from mbarbon/master
...
Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
2016-09-12 20:45:28 -07:00