aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/objective-c
Commit message (Collapse)AuthorAge
* Merge pull request #7359 from jcanizales/p0-protoc-podspecGravatar makdharma2016-07-13
|\ | | | | Distribute ProtoC and the plugin as pods
* \ Merge branch 'release-0_15' into upmerge-masterGravatar Nicolas "Pixel" Noble2016-07-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml gRPC-Core.podspec gRPC.podspec package.json package.xml src/core/lib/surface/version.c src/csharp/Grpc.Auth/project.json src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Core/project.json src/csharp/Grpc.HealthCheck/project.json src/csharp/build_packages.bat src/node/tools/package.json src/python/grpcio/grpc/__init__.py src/python/grpcio/grpc_version.py src/python/grpcio_tests/tests/unit/_rpc_test.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb templates/gRPC.podspec.template tools/distrib/python/grpcio_tools/grpc_version.py tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal tools/run_tests/port_server.py
| * \ Merge branch 'release-0_14' into release-0_15Gravatar Nicolas "Pixel" Noble2016-07-12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec src/objective-c/BoringSSL.podspec src/objective-c/examples/RemoteTestClient/RemoteTest.podspec src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj src/objective-c/tests/Podfile templates/gRPC.podspec.template third_party/protobuf
| | | * Merge master to resolve tests podspec conflictGravatar Jorge Canizales2016-07-11
| | | |\ | |_|_|/ |/| | |
| | | * Tests Podfile cleanupGravatar Jorge Canizales2016-07-11
| | | |
| | | * Use the deployed protoc spec in samples and READMEGravatar Jorge Canizales2016-07-11
| | | |
| | | * gRPC plugin podspec: license & deployment targetGravatar Jorge Canizales2016-07-11
| | | | | | | | | | | | For the spec to pass linting.
| | | * ProtoCompiler.podspec: license & deployment targetGravatar Jorge Canizales2016-07-11
| | | | | | | | | | | | For the spec to pass linting.
| | | * Podspecs for Protoc and the gRPC pluginGravatar Jorge Canizales2016-07-11
| | | | | | | | | | | | | | | | | | | | The examples under <repo_root>/examples now rely on the released versions. Those under src/objective-c/examples, as well as the tests, rely on protoc and the plugin as compiled from head.
* | | | removed unneeded import. fixes travis buildGravatar Makarand Dharmapurikar2016-07-08
| | | |
* | | | fixes #7219Gravatar Makarand Dharmapurikar2016-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified objc plugin to add two types of import statements for well known protos. Deleted unnecessary empty.proto as we'll be using wellknown empty.proto Modified test to use the well known empty.proto.
* | | | Merge pull request #7219 from jcanizales/merge-0.14-into-masterGravatar makdharma2016-07-08
|\ \ \ \ | | | | | | | | | | Merge 0.14 into master
* \ \ \ \ Merge pull request #7190 from dgquintas/bb_reader_errorGravatar Nicolas Noble2016-07-07
|\ \ \ \ \ | | | | | | | | | | | | Return success status of grpc_byte_buffer_reader_init
* \ \ \ \ \ Merge pull request #7159 from jcanizales/p0-connectivity-appGravatar kpayson642016-07-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | App to manually test behavior under changing connectivity conditions
| | | | | * | Add arm_arch.h back to fix compilation for devicesGravatar Jorge Canizales2016-07-07
| | | | | | |
| | * | | | | Merge branch 'complicated-syndrome-of-the-alien-kind' of ↵Gravatar David Garcia Quintas2016-07-02
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | https://github.com/soltanmm/grpc into bb_reader_error
| | | | | | * ProtoCompiler podspecGravatar Jorge Canizales2016-07-01
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still needed: - Make it build protoc if it’s not in the root (i.e. if we're developing locally) - Put the gRPC plugin in the GitHub release page, and add a podspec for it that does the same
| | | * | | Fix examples to work with local gRPC-CoreGravatar Jorge Canizales2016-07-01
| | | | | |
| | | * | | Merge commit '20caeb182cbc152e7e038306a9b01f438f79ca41' into ↵Gravatar Jorge Canizales2016-07-01
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | merge-0.14-into-master
| | | * | | Fix example Podfiles, and document betterGravatar Jorge Canizales2016-07-01
| | | | | |
| | | * | | Merge fixup: version, deployment target & spec nameGravatar Jorge Canizales2016-07-01
| | | | | |
| | * | | | Added comment for obj-cGravatar David Garcia Quintas2016-06-30
| | | | | |
| | * | | | Added TODO for php.Gravatar David Garcia Quintas2016-06-30
| | | | | |
| | * | | | Return success status of grpc_byte_buffer_readerGravatar David Garcia Quintas2016-06-30
| | | | | |
* | | | | | Merge pull request #6992 from y-zeng/auto-build-exampleGravatar makdharma2016-06-30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Build objective-c examples as part of automatic tests
| | | * | | Merge master into merge-0.14-into-masterGravatar Jorge Canizales2016-06-30
| | | |\ \ \ | |_|_|/ / / |/| | | | / | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - gRPC.podspec - Only had non-trivial changes in the core file list, which will need to be regenerated (in gRPC-Core.podspec). - src/objective-c/BoringSSL.podspec - Had trivial conflicts in the version. - src/objective-c/examples/RemoteTestClient/RemoteTest.podspec - Trivial conflicts in quoting. - src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj - The master version is used, pending testing. The 0.14 version had emoji and some unneeded entries. - src/objective-c/tests/Podfile - Added CronetFramework pod, and warning silencing from master. - templates/gRPC.podspec.template - Deleted. - third_party/protobuf - Using master commit, but need to verify if it works for frameworks.
* | | | | Merge pull request #6378 from jcanizales/let-invalidate-channelsGravatar Jan Tattermusch2016-06-30
|\ \ \ \ \ | | | | | | | | | | | | Add a maybe-temporary way for apps to clear the channel cache
* \ \ \ \ \ Merge pull request #7120 from makdharma/issue6746Gravatar Jan Tattermusch2016-06-30
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix for working with compressed data. Fixes #6746.
| | | * | | | Add comments in build_example_test.shGravatar Yuchen Zeng2016-06-30
| | | | | | |
| | | | | * | Merge pull request #7132 from jcanizales/pander-to-pod-lint-coreGravatar makdharma2016-06-30
| | | | | |\ \ | | | | | | | | | | | | | | | | Fix Cocoapods linter issues with gRPC-Core.podspec
| | | * | | | | Use protoc and objc plugins built by run_testGravatar Yuchen Zeng2016-06-29
| | | | | | | |
| | | | * | | | Add README.md explaining use of the appGravatar Jorge Canizales2016-06-29
| | | | | | | |
| | | | * | | | Make RPCs on a loopGravatar Jorge Canizales2016-06-29
| | | | | | | |
| | | | * | | | Add Podfile and pod installGravatar Jorge Canizales2016-06-29
| | | | | | | |
| | | | | * | | Merge pull request #7129 from jcanizales/pander-to-pod-lint-boringsslGravatar makdharma2016-06-29
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | Fix Cocoapods linter issues with BoringSSL.podspec
| | | | * | | | | Minimal iOS appGravatar Jorge Canizales2016-06-29
| | | | | | | | |
| * | | | | | | | fixed compiler warning #2Gravatar Makarand Dharmapurikar2016-06-29
| | | | | | | | |
* | | | | | | | | Merge pull request #7081 from y-zeng/build-example-travisGravatar Jan Tattermusch2016-06-29
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Build ObjC examples in travis
| | * | | | | | | fixed a compiler warningGravatar Makarand Dharmapurikar2016-06-29
| | | | | | | | |
| | | | | | | * | Divide gRPC-Core in Interface & Impl subspecsGravatar Jorge Canizales2016-06-28
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works around the Cocoapods' linter header_mapping_dir restrictions. Incidentally, it also removes the need to set build settings in the user target.
| | | | | | * | BoringSSL: further documentation nit.Gravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL fixup: pqueue.h is removed in v4Gravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL: move podspec to v4Gravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL: Document podspec hacksGravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL fixup: remove unneeded empty source fileGravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL: Intf and Impl subspecs. WIPGravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL: Point to v3 tag in the repoGravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | | * | BoringSSL: import all in the umbrella headerGravatar Jorge Canizales2016-06-28
| | | | | | | |
| | | | | * | | Merge pull request #7080 from jcanizales/p0-restore-connectivity-fixGravatar makdharma2016-06-28
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| | Restore fix undone by https://github.com/grpc/grpc/pull/5893
* | | | | | | | Merge pull request #7066 from y-zeng/ios-testGravatar Jan Tattermusch2016-06-28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix InteropTests.m