aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Moved all dependencies to devDependencies.Josh Haberman2016-06-221-6/+5
| | | | | | | | | | | | | | | | | | | | The runtime doesn't depend on anything, so these packages should always have been in devDependencies.
| * | | Add "google" to package.json "files" for WKT.Josh Haberman2016-06-221-0/+1
| | | |
| * | | Create patch release for JS to include WKT.Josh Haberman2016-06-221-1/+1
| | |/ | |/|
* | | Merge pull request #1707 from jskeet/format-valueJan Tattermusch2016-06-232-25/+58
|\ \ \ | |/ / |/| | Expose JsonFormatter.WriteValue.
| * | Expose JsonFormatter.WriteValue.Jon Skeet2016-06-232-25/+58
|/ / | | | | | | | | This isn't useful to most users, but can be handy in advanced use cases, as requested in #1465.
* | Merge pull request #1700 from jskeet/orderingJon Skeet2016-06-211-3/+4
|\ \ | | | | | | Remove ordering guarantees in the MapField documentation
| * | Remove ordering guarantees in the MapField documentationJon Skeet2016-06-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | This doesn't currently change the ordering in the implementation, but allows us to do so in the future. We also need to change https://developers.google.com/protocol-buffers/docs/reference/csharp-generated#singular which states "Finally, unlike Dictionary<TKey, TValue>, MapField<TKey, TValue> preserves insertion order of entries." (We can just remove that sentence, I think.)
* | | Rename methods to avoid ObjC KVC collisions. (#1699)Thomas Van Lenten2016-06-2114-7325/+7448
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Breaking API change on the Dictionary classes. The numeric value classes were using "Value" in the naming, but this silently collided with the KVC category on NSObject; meaning KVC code could break up a keypath and call these selectors with the wrong types leading to crashes (even though the code all would compile cleanly). - Rename the methods to use the "type" instead of literal "Value". - Update all the impls and tests. - Enable the warning that will catch issues like this in the future. Fixes https://github.com/google/protobuf/issues/1616
* | Adds destination flag to xcodebuild to avoid possible flake errors (#1697)Sergio Campamá2016-06-201-1/+6
| | | | | | | | Adds destination flag to xcodebuild to avoid possible flake errors
* | Merge pull request #1666 from yeswalrus/cmake-prerelease-examplesFeng Xiao2016-06-172-15/+22
|\ \ | | | | | | CMake Fix up prerelease version handling
| * | Fix prerelease version matching to be more consistent with the find_package ↵Walter Gray2016-06-092-15/+22
| | | | | | | | | | | | arguments.
* | | Merge pull request #1696 from haberman/jswktJoshua Haberman2016-06-172-5/+46
|\ \ \ | | | | | | | | JS: import well-known types from google-protobuf package.
| * | | Fix tests for CommonJS.Josh Haberman2016-06-161-2/+11
| | | |
| * | | Added plugin.proto to well-known types for JS.Josh Haberman2016-06-161-0/+1
| | | |
| * | | Bugfix: base the require logic on the file being required.Josh Haberman2016-06-161-4/+4
| | | |
| * | | JS: import well-known types from google-protobuf package.Josh Haberman2016-06-162-2/+33
| | | |
* | | | Add new generation option for using proto sources from other frameworks.Thomas Van Lenten2016-06-175-127/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better docs in the generator for the different options that can be passed during an invoke of protoc. - Add named_framework_to_proto_path_mappings_path to pass the path to a file containing mappings of frameworks for different proto files. - Update the generation to use the mapping to change the #import directives it creates. Note: the changes in helpers is mostly moving code within the fine, and then a small change to expose the parsing so a passed on class can consume the line. Fixes https://github.com/google/protobuf/issues/1457
* | | | Merge pull request #1692 from vjpai/friendlessFeng Xiao2016-06-161-4/+7
|\ \ \ \ | | | | | | | | | | Workaround for gcc-4.4 incompatibility
| * | | | Address review comments on function namevjpai2016-06-161-2/+2
| | | | |
| * | | | Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | constructor, and instead create an _internal_only getter that gets the needed information. This is a workaround for a deficiency in gcc-4.4 that does not properly support templated friend classes.
* | | | Merge pull request #1658 from yeswalrus/cmake-fixup-moduleFeng Xiao2016-06-151-24/+9
|\ \ \ \ | | | | | | | | | | Cleanup protobuf-module.cmake.in
| * | | | Removed handling for ALIASED targets since they are unused.Walter Gray2016-06-071-24/+9
| | |/ / | |/| |
* | | | Merge pull request #1665 from yeswalrus/cmake-package-requirementsFeng Xiao2016-06-153-12/+23
|\ \ \ \ | |_|/ / |/| | | CMake package requirements
| * | | make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use.Walter Gray2016-06-091-1/+3
| | | |
| * | | Save the relevant options used to create a package, allow users to reject ↵Walter Gray2016-06-092-11/+20
| |/ / | | | | | | | | | packages based on them.
* | | Merge pull request #1683 from thomasvl/third_party_frameworkThomas Van Lenten2016-06-155-10/+54
|\ \ \ | | | | | | | | Add support for generation sources into a framework.
| * | | Add support for generation sources into a framework.Thomas Van Lenten2016-06-155-10/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a protoc objc option (generate_for_named_framework) to set the name of the framework all generated sources will be in. - Tweak some comments/naming to make it clear what is the Protobuf framework vs. the framework for generated code. - Update the objc README to document the new generation option to protoc. This is working towards https://github.com/google/protobuf/issues/1457.
* | | | Add the CocoaPods integration tests to Travis.Sergio Campamá2016-06-143-1/+25
|/ / / | | | | | | | | | | | | | | | Also hotwires updating ruby as CocoaPods was crashing within a support library. Fixes #1619
* | | Fixes Xcode 8 analyzer warning saying that it was missing a release in ↵Sergio Campamá2016-06-141-0/+5
| | | | | | | | | | | | dealloc (#1678)
* | | Merge pull request #1664 from bshaffer/patch-1Feng Xiao2016-06-101-1/+1
|\ \ \ | | | | | | | | proper codeblock in README
| * | | proper codeblock in READMEBrent Shaffer2016-06-091-1/+1
|/ / /
* | | Merge pull request #879 from mathstuf/support-equals-in-proto-pathFeng Xiao2016-06-082-2/+22
|\ \ \ | |/ / |/| | protoc: support '=' in --proto_path arguments
| * | protoc: support '=' in --proto_path argumentsBen Boeckel2016-04-202-2/+22
| | |
* | | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTRBo Yang2016-06-073-3/+3
| | |
* | | Fix the undefined behavior for opensource users.Bo Yang2016-06-071-3/+5
| | |
* | | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioningFeng Xiao2016-06-072-17/+30
|\ \ \ | | | | | | | | CMake prerelease versioning
| * | | For prerelease versions, require protobuf_FIND_VERSION to be set.Walter Gray2016-05-311-16/+22
| | | |
| * | | Include the prerelease version in the protobuf_VERSIONWalter Gray2016-05-311-1/+8
| | | |
* | | | Merge pull request #1643 from yeswalrus/cmake-examplesFeng Xiao2016-06-078-76/+335
|\ \ \ \ | | | | | | | | | | Build examples in CMake
| * | | | Replace handwritten protobuf-targets with exported version.Walter Gray2016-06-063-39/+24
| | | | |
| * | | | Use ExternalProject_Add to build the examples in a stand-alone fashion.Walter Gray2016-06-062-62/+93
| | | | |
| * | | | CMake project updatesKonstantin Podsvirov2016-06-049-69/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A series of improvements: - Improved Protobuf module compatibility (disabled by default); - Hide advanced settings; - Added build tree configuration; - Added build of examples.
* | | | | Merge pull request #1541 from haberman/conformancestrictJoshua Haberman2016-06-0612-163/+155
|\ \ \ \ \ | |/ / / / |/| | | | Make conformance tests more strict about the failure list.
| * | | | Make surrogate regex even more lenient.Josh Haberman2016-06-061-2/+2
| | | | |
| * | | | JSON surrogates Python: adjust regex for OSX error message.Josh Haberman2016-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | OS X's version of Python has a slightly different error message for this error case.
| * | | | Added test for surrogates (valid and invalid).Josh Haberman2016-06-031-0/+21
| | | | |
| * | | | Added update_failure_list.py.Josh Haberman2016-06-031-0/+73
| | | | |
| * | | | Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-032-24/+6
| | | | |
| * | | | Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-035-83/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Python 2.x doesn't detect unpaired surrogates so we have to do that manually.
| * | | | Make conformance tests more strict about the failure list.Josh Haberman2016-06-035-80/+51
|/ / / / | | | | | | | | | | | | | | | | | | | | The failure lists were falling out of date because the tests would pass even if people forgot to remove failures from the list.