organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
3687 commits 28 branches 36 tags 41 MiB
Commit graph

3687 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jisi Liu
84bc5fc41e Update bazel and build for javalite branch 2017-03-09 12:29:42 -08:00
Jisi Liu
c9274a3800 Merge pull request #2808 from pherl/javalite-autogen 
Update gmock links.
 2017-03-09 11:17:05 -08:00
Feng Xiao
381ed97490 Update links in appveyor.yml 
Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
 2017-03-08 16:03:52 -08:00
Adrian Ludwin
71c475f97b Update repo to use google test 2017-03-08 15:42:41 -08:00
Feng Xiao
97cdd6e677 Update gmock links. 
The original link is no longer available.

Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
 2017-03-08 15:25:37 -08:00
Feng Xiao
8f2d5f07aa Merge pull request #2761 from cgrushko/patch-4 
Update protobuf.bzl for recent versions of Bazel
 2017-02-28 15:21:33 -08:00
cgrushko
8d92ae8bd4 Update protobuf.bzl for recent versions of Bazel 
HOST_CFG has been deprecated in favor of "host".
 2017-02-25 16:44:38 -05:00
Jisi Liu
82809aaebf Merge pull request #1886 from pherl/javalite 
Remove travis config for javalite
 2016-07-29 10:49:46 -07:00
Jisi Liu
0095b250f9 Remove travis config for javalite 2016-07-29 10:13:18 -07:00
Jisi Liu
b0f5cf02f8 Merge pull request #1877 from pherl/javalite 
Bump lite version 3.0.1
 2016-07-29 09:54:31 -07:00
Jisi Liu
a4f65cde70 Bump lite version 3.0.1 2016-07-28 15:30:20 -07:00
Jisi Liu
19015e344c Merge pull request #1876 from pherl/javalite 
Include javadoc/source in Java release packages.
 2016-07-28 14:58:58 -07:00
Feng Xiao
635bd681d8 Include javadoc/source in Java release packages. 
Also fixed javadoc errors.

[ci skip]
 2016-07-28 14:53:09 -07:00
Jisi Liu
c28192e1a3 Merge pull request #1873 from pherl/javalite 
Fix Javalite Pom
 2016-07-28 13:43:51 -07:00
Jisi Liu
ae895a5783 Update maven to call the plugin to generate javalite code. 2016-07-28 13:30:58 -07:00
Jisi Liu
8afbb84c48 update javalite versions. 2016-07-28 13:21:41 -07:00
Jisi Liu
1f71f8bbf8 Merge pull request #1872 from pherl/fixwin-javalite 
Fix build protoc script for windows
 2016-07-28 13:13:46 -07:00
Jisi Liu
d608b376cf Fix build protoc script for windows 2016-07-28 19:52:04 +00:00
Jisi Liu
a1a718123f Merge pull request #1856 from pherl/javalite 
Add protoc-gen-javalite pom file in javalite branch.
 2016-07-26 17:56:11 -07:00
Jisi Liu
236fb11189 Change documentation for javalite release 2016-07-26 17:32:31 -07:00
Jisi Liu
e8ede18912 Move the protoc pom to protoc-pom.xml in the lite. 
This avoid accidental release the protoc using the lite branch.
 2016-07-26 17:11:30 -07:00
Jisi Liu
1daef9c0eb Add a pom for javalite plugin 2016-07-26 16:58:19 -07:00
Jisi Liu
9c8f603b70 Merge pull request #1854 from pherl/javalite 
Cherry pick protoc-artifacts change into the javalite branch
 2016-07-26 16:53:39 -07:00
Jisi Liu
6ebb1b219c fix comments. 2016-07-26 16:52:14 -07:00
Jisi Liu
44248d72a6 Fix the script comments. 2016-07-26 16:43:58 -07:00
Jisi Liu
4261c67b73 Make protoc-artifacts able to build plugin. 2016-07-26 16:43:49 -07:00
Jisi Liu
9c8c7ea675 Merge pull request #1840 from pherl/javalite 
Add lite plugin output to gitignore
 2016-07-25 12:03:48 -07:00
Jisi Liu
9b4a6259b3 Add lite plugin output to gitignore 2016-07-25 11:50:59 -07:00
Jisi Liu
0c011c4c3c Merge pull request #1793 from pherl/javalite 
Add a javalite plugin.
 2016-07-15 12:39:34 -07:00
Jisi Liu
b702a16f27 Add a javalite plugin. 2016-07-15 12:30:10 -07:00
Jon Skeet
10a8fb4e73 Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform (#1727) 
Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform

This also updates the version number to 3.0.0-beta4
 2016-07-14 22:01:47 +01:00
Jon Skeet
042993b3dd Implement RepeatedField.AddRange (#1733) 
* Improve exception throwing implementation in collections

* Implement RepeatedField.AddRange.

This fixes issue #1730.

* Optimize AddRange for sequences implementing ICollection

(Also fix a few more C# 6-isms.)

* Remove the overload for Add(RepeatedField<T>)

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.
 2016-07-13 11:36:19 +01:00
Feng Xiao
8eb90e380c Merge pull request #1778 from yeswalrus/fix-prerelease-version 
Fix a <package>_FIND_VERSION_PRERELEASE being ignored
 2016-07-12 16:36:41 -07:00
Walter Gray
5520447a78 Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to be ignored. 2016-07-12 15:19:32 -07:00
Thomas Van Lenten
70c1ac756d Merge pull request #1776 from thomasvl/fix_dist 
Remove the baseline files from the make dist file list.
 2016-07-12 11:39:52 -04:00
Thomas Van Lenten
0d079bca76 Remove the baseline files from the make dist file list. 
https://github.com/google/protobuf/pull/1762 remove the files, but I forgot to
update Makefile.am to remove them.
 2016-07-12 11:35:28 -04:00
Jos Hickson
790e6afb72 Fixed out-of-date documentation for CodedInputStream.ReadEnum. (#1581) 2016-07-10 21:31:35 +01:00
Jon Skeet
3560cc9ede Merge pull request #1702 from lukebakken/csharp-nuget-doc-update 
Modify csharp README since there are now two NuGet packages
 2016-07-10 21:30:31 +01:00
Jon Skeet
8779cba302 Merge pull request #1764 from jskeet/remove-is-value-type 
Remove unnecessary reflection call
 2016-07-09 07:16:06 +01:00
Jon Skeet
3df146e198 Remove unnecessary reflection call 
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
 2016-07-08 18:21:25 +01:00
Thomas Van Lenten
c404c2a2e3 Merge pull request #1762 from thomasvl/drop_perf_profiles 
Drop the performace baselines.
 2016-07-08 12:25:13 -04:00
Thomas Van Lenten
8c23655519 Drop the performace baselines. 
We weren't really using them, and the nested path causes checkout problems
on windows.
 2016-07-08 12:21:53 -04:00
Thomas Van Lenten
8b00675fc8 Merge pull request #1757 from thomasvl/avoid_importing_src 
Don't #import the .m files.
 2016-07-07 17:27:26 -04:00
Jon Skeet
03d9e096d9 Merge pull request #1735 from jskeet/attribute-placement 
Change placement of DebuggerNonUserCodeAttribute
 2016-07-07 22:11:22 +01:00
Feng Xiao
c850ebcafa Merge pull request #1758 from dago/pathmax2 
Make sure also Solaris x86 gets PATH_MAX
 2016-07-07 13:58:11 -07:00
Jon Skeet
e9a7fc837f Remove WriteGeneratedTypeAttributes which is a no-op 
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.
 2016-07-07 20:20:42 +01:00
Dagobert Michelsen
57638d58e1 Make sure also Solaris x86 gets PATH_MAX 2016-07-07 20:36:01 +02:00
Jisi Liu
eaf3451cbb Merge pull request #1753 from xfxyjwf/fixup 
Fix problems detected when integrating the code to our internal repo.
 2016-07-07 09:19:40 -07:00
Thomas Van Lenten
be0d7f6664 Don't #import the .m files. 
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.
 2016-07-07 08:45:18 -04:00
Feng Xiao
0d5091ee88 Merge pull request #1742 from ottok/fix-spelling 
Fix spelling
 2016-07-06 15:44:34 -07:00