aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Mention Java lite in the changelog.Gravatar Feng Xiao2016-07-15
| | | | Change-Id: Ic07a7c664930209974244c66885d672288982610
* Added 3.0.0-beta-4 changelog.Gravatar Feng Xiao2016-07-15
| | | | Change-Id: I997012e7e9b58d9ec8b2f59429d71c98d81aa40d
* Merge pull request #1787 from xfxyjwf/steppingstoneGravatar Feng Xiao2016-07-15
|\ | | | | Fix compatibility issues for the future GeneratedMessageV3 change.
| * Fix compatiblity issues.Gravatar Feng Xiao2016-07-14
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar Feng Xiao2016-07-14
|
* Merge pull request #1785 from jskeet/merge-csharpGravatar Jon Skeet2016-07-14
|\ | | | | Merge C# changes from master to 3.0.0-beta4
| * Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Gravatar Jon Skeet2016-07-14
| | | | | | | | | | | | platform (#1727) This also updates the version number to 3.0.0-beta4
| * Remove the overload for Add(RepeatedField<T>)Gravatar Jon Skeet2016-07-14
| | | | | | | | | | | | | | 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 ICollectionGravatar Jon Skeet2016-07-14
| | | | | | | | (Also fix a few more C# 6-isms.)
| * Implement RepeatedField.AddRange.Gravatar Jon Skeet2016-07-14
| | | | | | | | This fixes issue #1730.
| * Improve exception throwing implementation in collectionsGravatar Jon Skeet2016-07-14
|/
* Merge pull request #1781 from xfxyjwf/update_versionGravatar Feng Xiao2016-07-14
|\ | | | | Update version number to 3.0.0-beta-4
| * Update version number in AssemblyInfo.cs.Gravatar Feng Xiao2016-07-14
| |
* | Merge pull request #1783 from xfxyjwf/fixliteGravatar Jisi Liu2016-07-14
|\ \ | | | | | | Comment out lite conformance test.
| * | Exclude Java lite module from parent pom.xmlGravatar Feng Xiao2016-07-13
| | |
| * | Comment out lite conformance test.Gravatar Feng Xiao2016-07-13
|/ / | | | | | | The 'lite' generator flag is no longer supported.
| * Update version number to 3.0.0-beta-4Gravatar Feng Xiao2016-07-13
|/
* Add missing LIBPROTOBUF_EXPORTGravatar Feng Xiao2016-07-13
|
* Add missing LIBPROTOBUF_EXPORT.Gravatar Feng Xiao2016-07-13
|
* Update generated files.Gravatar Feng Xiao2016-07-13
|
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* Merge pull request #1776 from thomasvl/fix_distGravatar Thomas Van Lenten2016-07-12
|\ | | | | Remove the baseline files from the make dist file list.
| * Remove the baseline files from the make dist file list.Gravatar Thomas Van Lenten2016-07-12
|/ | | | | https://github.com/google/protobuf/pull/1762 remove the files, but I forgot to update Makefile.am to remove them.
* Fixed out-of-date documentation for CodedInputStream.ReadEnum. (#1581)Gravatar Jos Hickson2016-07-10
|
* Merge pull request #1702 from lukebakken/csharp-nuget-doc-updateGravatar Jon Skeet2016-07-10
|\ | | | | Modify csharp README since there are now two NuGet packages
* \ Merge pull request #1764 from jskeet/remove-is-value-typeGravatar Jon Skeet2016-07-09
|\ \ | | | | | | Remove unnecessary reflection call
| * | Remove unnecessary reflection callGravatar Jon Skeet2016-07-08
| | | | | | | | | | | | | | | This is the only call to TypeExtensions.IsValueType, so we can remove that method, making the whole type conditionally compiled out for .NET 3.5
* | | Merge pull request #1762 from thomasvl/drop_perf_profilesGravatar Thomas Van Lenten2016-07-08
|\ \ \ | |/ / |/| | Drop the performace baselines.
| * | Drop the performace baselines.Gravatar Thomas Van Lenten2016-07-08
|/ / | | | | | | | | We weren't really using them, and the nested path causes checkout problems on windows.
* | Merge pull request #1757 from thomasvl/avoid_importing_srcGravatar Thomas Van Lenten2016-07-07
|\ \ | | | | | | Don't #import the .m files.
* \ \ Merge pull request #1735 from jskeet/attribute-placementGravatar Jon Skeet2016-07-07
|\ \ \ | | | | | | | | Change placement of DebuggerNonUserCodeAttribute
* \ \ \ Merge pull request #1758 from dago/pathmax2Gravatar Feng Xiao2016-07-07
|\ \ \ \ | | | | | | | | | | Make sure also Solaris x86 gets PATH_MAX
| | * | | Remove WriteGeneratedTypeAttributes which is a no-opGravatar Jon Skeet2016-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not affect the generated code. If we decide we want to apply attributes to generated types, we should start by just reverting this change.
| * | | | Make sure also Solaris x86 gets PATH_MAXGravatar Dagobert Michelsen2016-07-07
|/ / / /
* | | | Merge pull request #1753 from xfxyjwf/fixupGravatar Jisi Liu2016-07-07
|\ \ \ \ | | | | | | | | | | Fix problems detected when integrating the code to our internal repo.
| | | * | Don't #import the .m files.Gravatar Thomas Van Lenten2016-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As bazel folks are looking at getting auto generation of module maps going and the importing of sources files causes issues there. We were only do it to hack around some of the apple linker behaviors around objc classes and categories, but even that isn't complete and CocoaPods was already doing -ObjC, and developers not using pods could have still needed it to ensure everything was linked anyways; so drop the hack of importing sources.
* | | | | Merge pull request #1742 from ottok/fix-spellingGravatar Feng Xiao2016-07-06
|\ \ \ \ \ | | | | | | | | | | | | Fix spelling
| | * | | | Fix data member declaration order.Gravatar Feng Xiao2016-07-06
| | | | | |
| | * | | | Don't support global ::string in stringpiece.hGravatar Feng Xiao2016-07-06
| | | |/ / | | |/| |
* | | | | Merge pull request #1752 from acozzette/fix-js-testsGravatar Adam Cozzette2016-07-06
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed failing JS tests
| * | | | Fixed failing JS testsGravatar Adam Cozzette2016-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of small tweaks were needed to fix test failures that were inadvertently introduced in the last down integration. I also had to add the map.js file which was missing.
* | | | | Merge pull request #1712 from dkharrat/swift-error-handlingGravatar Thomas Van Lenten2016-07-06
|\ \ \ \ \ | | | | | | | | | | | | add nullable qualifier to return types that can be nil, to support Swift 2 try-catch syntax
| * | | | | add nullable qualifier to nil return typesGravatar Dia Kharrat2016-07-05
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add the `nullable` qualifier to return types of Objective-C methods that can return a nil due to errors. This change makes these methods compatible with the Swift 2 try-catch syntax.
| | | * | Changes to generated code from previous commitGravatar Jon Skeet2016-07-04
| | | | |
| | | * | Move DebuggerNonUserCodeAttribute to function membersGravatar Jon Skeet2016-07-04
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this has caught everything. I've left a stub for attributes to be applied to the types themselves, but we don't currently need anything. Follow-up commit will include the changes to generated code itself. Fixes #1671.
| | * | Fix spelling error in function ParseTime parameterGravatar Otto Kekäläinen2016-07-03
| | | |
| | * | Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
| |/ / |/| |
* | | Merge pull request #1704 from lizan/json_parse_optionsGravatar Feng Xiao2016-07-01
|\ \ \ | |/ / |/| | Add JsonParseOptions to ignore unknown fields
* | | Merge pull request #1738 from xfxyjwf/fixbuildGravatar Feng Xiao2016-07-01
|\ \ \ | | | | | | | | Fix some failing travis tests.
| * | | Fix some failing travis tests.Gravatar Feng Xiao2016-07-01
|/ / / | | | | | | | | | | | | | | | | | | 1. Add missing header file to Makefile.am. 2. Re-generate objectivec generated code for well-known types. Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7