aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1821 from haberman/rubyfreezestrJoshua Haberman2016-07-2511-83/+132
|\ | | | | Ruby: encode and freeze strings when the are assigned or decoded.
| * Ruby: fixed string freezing for JRuby.Josh Haberman2016-07-255-25/+30
| |
| * Ruby: encode and freeze strings when the are assigned or decoded.Josh Haberman2016-07-217-60/+104
| |
* | Merge pull request #1830 from xfxyjwf/travisFeng Xiao2016-07-231-14/+7
|\ \ | | | | | | Remove linux tests from travis.
| * | Keep cpp_distcheck on travis for now.Feng Xiao2016-07-222-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | When it runs in parallel with other jenkins tests, multiple tests start to fail probably because cpp_distcheck will update the C++ lib that other tests (such as python_cpp) are depending on. Change-Id: Ibca0243084bb6b81c811b62c75288e20cc2aabf5
| * | Remove linux tests from travis.Feng Xiao2016-07-222-11/+1
| | | | | | | | | | | | | | | | | | | | | These tests are already covered by jenkins and right now jenkins can finish these tests much quicker then travis. Change-Id: I5799761ccc338211d750940e3cf4c8e2569c8144
* | | Merge pull request #1829 from xfxyjwf/fixcppFeng Xiao2016-07-234-349/+34
|\ \ \ | |/ / |/| | Fix sign-comparison warnings and add a test for that.
| * | Fix sign-comparison warnings in public header files.Feng Xiao2016-07-222-6/+6
| | |
| * | Add a test to catch sign-comparison warnings.Feng Xiao2016-07-222-343/+28
| | | | | | | | | | | | | | | | | | | | | | | | grpc build treates them as errors and such issues (protobuf change breaks grpc) has been reported repeatedly. For example: https://github.com/google/protobuf/issues/1813 Change-Id: I077c4557cf3effd5195f88802c38999b884edc30
* | | Merge pull request #1825 from xfxyjwf/jenkins2Feng Xiao2016-07-225-23/+39
|\ \ \ | | | | | | | | Add more tests to jenkins.
| * | | Add more tests to jenkins.Feng Xiao2016-07-215-23/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added ruby22 and jruby tests to jenkins. 2. Added javascript tests to jenkins. 3. Added golang tests to jenkins. 4. Removed ruby19/ruby20 tests from travis. Support for ruby 2.0 has ended since 2016/02/24. https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/ Change-Id: Ie984b06772335352a4be7067ab2485f923875685
* | | Merge pull request #1828 from sergiocampama/frameworkFeng Xiao2016-07-222-2/+3
|\ \ \ | |/ / |/| | Fixes the parsing of the proto-framework map file.
| * | Fixes the parsing of the proto-framework map file.Sergio Campama2016-07-222-2/+3
|/ / | | | | | | | | - Fixes memory issue where the pointer to the StringPiece would be allocated on the stack, and would mangle the output. - Fixes length of the file name when parsing the comma separated files.
* | Merge pull request #1822 from xfxyjwf/java6Feng Xiao2016-07-212-20/+3
|\ \ | |/ |/| Update travis tests for Java.
| * Update travis tests for Java.Feng Xiao2016-07-212-20/+3
|/ | | | | | | | | | | | 1. Set JAVA_HOME so mvn can pick up the correct java version. 2. Remove jdk6 tests. It has been broken for a while and remain undetected as mvn is actually using java 7 to build the code. Given that we have set -source and -target to 6 in the pom.xml and the built .jar should be usable by java 6, having a dedicated java 6 test doesn't seem necessary (assuming very few Java 6 users want to compile protobuf Java from source). Change-Id: I4f14da772632df3e47801f180198242b306c3f0f
* Merge pull request #1811 from xfxyjwf/fixdistFeng Xiao2016-07-202-0/+26
|\ | | | | Add missing files in EXTRA_DIST and add a test.
| * Add missing files in EXTRA_DIST and add a test.Feng Xiao2016-07-202-0/+26
|/ | | | Change-Id: If80725402173cdf50969cb08e7fe5affe3532fb2
* Merge pull request #1810 from xfxyjwf/versioningFeng Xiao2016-07-2013-768/+2879
|\ | | | | Versioning Java GeneratedMessage class
| * Add files missing from "make dist".Feng Xiao2016-07-192-36/+96
| | | | | | | | Change-Id: I56a6cce613462794f172ff2e62b25d8a9fc162f3
| * Update compatibility tests as well.Feng Xiao2016-07-193-347/+8
| | | | | | | | Change-Id: I991396ac6e51e32f3ab1daa501d625f34c3ecb04
| * Versioning Java GeneratedMessage.Feng Xiao2016-07-198-385/+2775
| | | | | | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* | Merge pull request #1812 from jskeet/fix-travisJon Skeet2016-07-201-1/+1
|\ \ | | | | | | Use the dotnet-release package feed for Travis.
| * | Use the dotnet-release package feed for Travis.Jon Skeet2016-07-191-1/+1
| |/ | | | | | | See https://github.com/dotnet/core/issues/227 for background.
* | Merge pull request #1447 from seishun/defaultsJoshua Haberman2016-07-204-73/+80
|\ \ | |/ |/| JavaScript: Make implicit defaults consistent with explicit defaults
| * fix debug.dumpNikolai Vavilov2016-07-201-2/+4
| |
| * restore old behavior for toObjectNikolai Vavilov2016-07-192-13/+37
| |
| * nitsNikolai Vavilov2016-07-191-32/+21
| |
| * Make implicit defaults consistent with explicit defaultsNikolai Vavilov2016-07-193-96/+88
|/
* Merge pull request #1802 from haberman/jsmapbinJoshua Haberman2016-07-184-131/+151
|\ | | | | JavaScript: segregate references to binary functionality
| * Fix goog.require()/goog.provide() ordering.Josh Haberman2016-07-182-2/+2
| |
| * JavaScript: move extension binary info to separate struct.Josh Haberman2016-07-183-38/+85
| |
| * JavaScript maps: move binary callbacks out of constructor.Josh Haberman2016-07-183-93/+66
| | | | | | | | | | | | This change will help us separate binary support into separate files, because we only refer to binary serialization functions in the actual binary serialization paths.
* | Merge pull request #1803 from xfxyjwf/javadocFeng Xiao2016-07-196-16/+42
|\ \ | | | | | | Include javadoc/source in Java release packages.
| * | Include javadoc/source in Java release packages.Feng Xiao2016-07-186-16/+42
|/ / | | | | | | | | | | Also fixed javadoc errors. [ci skip]
* | Merge remote-tracking branch 'origin/3.0.0-beta-4'Feng Xiao2016-07-1890-784/+1811
|\ \ | |/ |/|
| * Merge pull request #1792 from xfxyjwf/changelogv3.0.0-beta-4Feng Xiao2016-07-182-1/+82
| |\ | | | | | | Added 3.0.0-beta-4 changelog.
| | * Remove Java deterministic API.Feng Xiao2016-07-182-5/+2
| | | | | | | | | | | | Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c
| | * Mention Java lite in the changelog.Feng Xiao2016-07-151-0/+4
| | | | | | | | | | | | Change-Id: Ic07a7c664930209974244c66885d672288982610
| | * Added 3.0.0-beta-4 changelog.Feng Xiao2016-07-151-0/+80
| |/ | | | | | | Change-Id: I997012e7e9b58d9ec8b2f59429d71c98d81aa40d
| * Merge pull request #1787 from xfxyjwf/steppingstoneFeng Xiao2016-07-152-4/+72
| |\ | | | | | | Fix compatibility issues for the future GeneratedMessageV3 change.
| | * Fix compatiblity issues.Feng Xiao2016-07-142-4/+72
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some public API methods are defined in GenreatedMessage.java and they have a generric return type: class GeneratedMessage { class Builder<BuilderType extends Builder<BuilderType>> { public BuilderType setField(...); public BuilderType setExtension(...); } } With these definitions, the compiled byte code of a callsite will have a direct reference to GeneratedMessage. For example: fooBuilder.setField(...); becomes: ##: invokevirtual // Method Builder.setField:(...)LGeneratedMessage.Builder ##: checkcast // class Builder This will prevent us from updating generated classes to subclass a different versioned GeneratedMessageV3 class in the future (we can't do it in a binary compatible way). This change addresses the problem by overriding these methods directly in the generated class: class Foo { class Builder extends GeneratedMessage.Builder<Builder> { public Builder setField(...) { return super.setField(...); } } } After this, fooBuilder.setField(...) will be compiled to: ##: invokevirtual // Method Builder.setField:(...)LFoo.Builder The callsites will no longer reference GeneratedMessage directly and we can change Foo to subclass GeneratedMessageV3 without breaking binary compatiblity. The downside of this change is: 1. It increases generated code size (though it saves some instructions on the callsites). 2. We can never stop generating these overrides because doing that will break binary compatibility. Change-Id: I879afbbc1325a66324a51565e017143489b06e97
| * Add missing golden test file.Feng Xiao2016-07-141-0/+1
| |
| * Merge pull request #1785 from jskeet/merge-csharpJon Skeet2016-07-1446-881/+538
| |\ | | | | | | Merge C# changes from master to 3.0.0-beta4
| | * Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Jon Skeet2016-07-1443-818/+367
| | | | | | | | | | | | | | | | | | platform (#1727) This also updates the version number to 3.0.0-beta4
| | * Remove the overload for Add(RepeatedField<T>)Jon Skeet2016-07-142-19/+23
| | | | | | | | | | | | | | | | | | | | | We now just perform the optimization within AddRange itself. This is a breaking change in terms of "drop in the DLL", but is source compatible, which should be fine.
| | * Optimize AddRange for sequences implementing ICollectionJon Skeet2016-07-142-8/+110
| | | | | | | | | | | | (Also fix a few more C# 6-isms.)
| | * Implement RepeatedField.AddRange.Jon Skeet2016-07-142-1/+23
| | | | | | | | | | | | This fixes issue #1730.
| | * Improve exception throwing implementation in collectionsJon Skeet2016-07-142-45/+25
| |/
| * Merge pull request #1781 from xfxyjwf/update_versionFeng Xiao2016-07-1415-17/+17
| |\ | | | | | | Update version number to 3.0.0-beta-4
| | * Update version number in AssemblyInfo.cs.Feng Xiao2016-07-141-1/+1
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 17:10:00 +0000