Commit Graph

3597 Commits

Author SHA1 Message Date
Thomas Van Lenten
a230b5d209 Rename methods to avoid ObjC KVC collisions. (#1699)
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
2016-06-21 08:25:28 -04:00
Sergio Campamá
1a5333b8c1 Adds destination flag to xcodebuild to avoid possible flake errors (#1697)
Adds destination flag to xcodebuild to avoid possible flake errors
2016-06-20 13:44:38 -04:00
Feng Xiao
4f93098eb3 Merge pull request #1666 from yeswalrus/cmake-prerelease-examples
CMake Fix up prerelease version handling
2016-06-17 13:15:49 -07:00
Joshua Haberman
b7560df598 Merge pull request #1696 from haberman/jswkt
JS: import well-known types from google-protobuf package.
2016-06-17 11:14:25 -07:00
Thomas Van Lenten
8c20e55c57 Add new generation option for using proto sources from other frameworks.
- 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
2016-06-17 10:31:05 -04:00
Josh Haberman
104723fccf Fix tests for CommonJS. 2016-06-16 18:40:07 -07:00
Feng Xiao
98bd6d753a Merge pull request #1692 from vjpai/friendless
Workaround for gcc-4.4 incompatibility
2016-06-16 16:19:42 -07:00
Josh Haberman
4308cc4d46 Added plugin.proto to well-known types for JS. 2016-06-16 16:05:47 -07:00
vjpai
6daf3d2c4a Address review comments on function name 2016-06-16 15:43:23 -07:00
Josh Haberman
0e27112c2b Bugfix: base the require logic on the file being required. 2016-06-16 14:45:42 -07:00
Josh Haberman
1337486755 JS: import well-known types from google-protobuf package. 2016-06-16 11:59:08 -07:00
Vijay Pai
37eaae2006 Remove a friend-class template that is only used for the
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.
2016-06-15 20:42:52 -07:00
Feng Xiao
52598c646e Merge pull request #1658 from yeswalrus/cmake-fixup-module
Cleanup protobuf-module.cmake.in
2016-06-15 17:06:36 -07:00
Feng Xiao
a5e116aaf6 Merge pull request #1665 from yeswalrus/cmake-package-requirements
CMake package requirements
2016-06-15 17:05:55 -07:00
Thomas Van Lenten
f180ef6398 Merge pull request #1683 from thomasvl/third_party_framework
Add support for generation sources into a framework.
2016-06-15 11:39:21 -04:00
Thomas Van Lenten
a2a3399a6f Add support for generation sources into a framework.
- 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.
2016-06-15 11:36:52 -04:00
Sergio Campamá
f0c1492ef6 Add the CocoaPods integration tests to Travis.
Also hotwires updating ruby as CocoaPods was crashing within a support library.

Fixes #1619
2016-06-14 14:26:01 -04:00
Sergio Campamá
71f4a9c6f3 Fixes Xcode 8 analyzer warning saying that it was missing a release in dealloc (#1678) 2016-06-14 09:28:22 -04:00
Feng Xiao
088c5c491e Merge pull request #1664 from bshaffer/patch-1
proper codeblock in README
2016-06-10 10:14:15 -07:00
Walter Gray
4150a91c14 make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use. 2016-06-09 17:27:46 -07:00
Walter Gray
78b3498bf4 Save the relevant options used to create a package, allow users to reject packages based on them. 2016-06-09 17:27:46 -07:00
Walter Gray
5ebcfc1cfd Fix prerelease version matching to be more consistent with the find_package arguments. 2016-06-09 17:22:31 -07:00
Brent Shaffer
f8a969d50a proper codeblock in README 2016-06-09 10:36:21 -07:00
Feng Xiao
fba7976f5d Merge pull request #879 from mathstuf/support-equals-in-proto-path
protoc: support '=' in --proto_path arguments
2016-06-08 14:43:45 -07:00
Walter Gray
cadfbc8e2f Removed handling for ALIASED targets since they are unused. 2016-06-07 20:33:24 -07:00
Bo Yang
401e07d372 Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR 2016-06-07 16:36:13 -07:00
Bo Yang
b60e615cba Fix the undefined behavior for opensource users. 2016-06-07 14:15:07 -07:00
Feng Xiao
6aa981f949 Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning
CMake prerelease versioning
2016-06-07 14:08:03 -07:00
Feng Xiao
dfe0c9ad38 Merge pull request #1643 from yeswalrus/cmake-examples
Build examples in CMake
2016-06-07 10:14:20 -07:00
Joshua Haberman
ed1d560023 Merge pull request #1541 from haberman/conformancestrict
Make conformance tests more strict about the failure list.
2016-06-06 21:49:48 -07:00
Josh Haberman
350453f2d5 Make surrogate regex even more lenient. 2016-06-06 17:14:58 -07:00
Josh Haberman
923d2c7ccf JSON surrogates Python: adjust regex for OSX error message.
OS X's version of Python has a slightly different error
message for this error case.
2016-06-06 13:57:59 -07:00
Walter Gray
23fef56e6d Replace handwritten protobuf-targets with exported version. 2016-06-06 12:06:55 -07:00
Walter Gray
09f6a5c1d2 Use ExternalProject_Add to build the examples in a stand-alone fashion. 2016-06-06 12:06:55 -07:00
Konstantin Podsvirov
71556295ff CMake project updates
A series of improvements:

- Improved Protobuf module compatibility (disabled by default);
- Hide advanced settings;
- Added build tree configuration;
- Added build of examples.
2016-06-04 00:10:07 +03:00
Josh Haberman
6a618949aa Added test for surrogates (valid and invalid). 2016-06-03 10:24:23 -07:00
Josh Haberman
84a1b60703 Added update_failure_list.py. 2016-06-03 09:39:38 -07:00
Josh Haberman
4833b4c003 Surrogate checking is unpredictable, so always manually check. 2016-06-03 09:39:38 -07:00
Josh Haberman
bd98eae1c9 Fixed Python by updating failure lists and fixed a few broken tests.
Python 2.x doesn't detect unpaired surrogates so we have to
do that manually.
2016-06-03 09:39:38 -07:00
Josh Haberman
ef7894e2dc Make conformance tests more strict about the failure list.
The failure lists were falling out of date because the
tests would pass even if people forgot to remove failures
from the list.
2016-06-03 09:39:38 -07:00
Bo Yang
20b532544f Integrate interanl changes 2016-06-02 15:44:32 -07:00
Sergio Campamá
e34c09182e Improving the granularity parsing errors (#1623)
Add more context to GPBCodedInputStream failures.
Have GPBMessage parsing apis extract out the GPBCodedInputStream information and expose it.
Update HeaderDocs with pointers to all error domains/codes.
Expand the unittests to cover the full set of errors reported.

Fixes https://github.com/google/protobuf/issues/1618
2016-06-02 14:14:26 -04:00
Feng Xiao
0ab7a7f744 Merge pull request #1640 from os72/master
Add https://github.com/os72/protobuf-dynamic
2016-06-02 10:20:52 -07:00
os72
f6be0d1fc1 Add https://github.com/os72/protobuf-dynamic
Add reference to Protocol Buffers Dynamic Schema (https://github.com/os72/protobuf-dynamic)
2016-05-31 22:07:14 -07:00
Walter Gray
0420eab173 For prerelease versions, require protobuf_FIND_VERSION to be set. 2016-05-31 17:47:18 -07:00
Walter Gray
f1091ab1aa Include the prerelease version in the protobuf_VERSION 2016-05-31 17:07:41 -07:00
Feng Xiao
18a9140f33 Merge pull request #1625 from yeswalrus/note-versions
Update the list of places where the version is stored.
2016-05-31 18:37:08 -04:00
Feng Xiao
cc30be105c Merge pull request #1613 from yeswalrus/cmake-min-version
Bump cmake minimum required version to 2.8.12
2016-05-31 18:35:28 -04:00
Feng Xiao
c4611939cd Merge pull request #1629 from zhongfq/patch-1
add protobuf as3 lib and code generator for as3
2016-05-31 14:06:26 -04:00
Feng Xiao
a315bb8b1e Merge pull request #1614 from yeswalrus/cmake-cleanup
Remove unused lines from CMake files.
2016-05-31 13:51:07 -04:00