Commit Graph

126 Commits

Author SHA1 Message Date
Muxi Yan 43b17bff17 Merge remote-tracking branch 'upstream/master' into isolate-call-implementation-2 2019-08-09 10:06:36 -07:00
Muxi Yan 9d77037106 clang-format 2019-08-09 10:02:00 -07:00
Muxi Yan 3ffa07cb12
Merge pull request #19787 from Tony1023/tv/watchOS
Added experimental tvOS and watchOS support
2019-08-07 13:29:47 -07:00
Muxi Yan f5cd8eb7c8 Merge remote-tracking branch 'upstream/master' into isolate-call-implementation-2 2019-08-05 10:40:14 -07:00
Karthik Ravi Shankar fcb43f9dee Regenerate projects 2019-08-01 17:34:02 -07:00
Muxi Yan f20cfd3844 Build system reorg 2019-07-24 21:40:58 -07:00
Muxi Yan d6a201b62b Isolate legacy in ProtoRPC 2019-07-23 10:16:11 -07:00
Tony Lu 90dac25693 Added watchOS sample 2019-07-12 17:21:35 -07:00
Esun Kim cd27a36924 Regenerate projects 2019-06-18 15:40:50 -07:00
Srini Polavarapu 6bc2ff1b5f Regenerate projects 2019-05-10 10:38:59 -07:00
Muxi Yan 71727d1efb Merge remote-tracking branch 'upstream/master' into default-cfstream-2 2019-04-01 15:34:07 -07:00
Lidi Zheng 0231bf3b01 Regenerate projects 2019-03-29 16:24:50 -07:00
Muxi Yan d771bcab2c Merge remote-tracking branch 'upstream/master' into default-cfstream-2 2019-03-28 14:49:15 -07:00
Srini Polavarapu b0efc103e3 Regenerate projects 2019-02-12 21:07:42 -08:00
Muxi Yan c3e1c72194
Merge branch 'master' into feature/supportTVOS 2019-01-18 15:53:04 -08:00
Maxim Bunkov 736985cba1 Merge master into feature/supportTVOS 2019-01-17 10:24:45 +05:00
Muxi Yan 0ed65db5d2
Merge branch 'master' into default-cfstream-2 2019-01-11 16:31:34 -08:00
Sanjay Pujare 94d5587643 Regenerate projects 2019-01-03 15:35:20 -08:00
Muxi Yan a7643b1f42 build projects 2018-12-27 11:40:17 -08:00
Maxim Bunkov b6ac1cb5b4 added support tvos 2018-12-11 14:11:00 +05:00
Muxi Yan 97ec5c1d68 Bump version to v1.17.0 2018-12-03 11:53:33 -08:00
Stanley Cheung 698cf221d8 Regenerate projects 2018-11-28 09:24:31 -08:00
Stanley Cheung 42e3ae7309 Re-generate projects 2018-11-20 23:36:04 -08:00
Muxi Yan da14743f1a Generate projects 2018-11-19 15:32:20 -08:00
Muxi Yan f3e4ae633e Regenerate projects 2018-11-19 15:24:53 -08:00
Stanley Cheung e5ce1e36e6 Regenerate projects 2018-10-08 15:50:50 -07:00
Juanli Shen 8ceb27a324 Regenerate projects 2018-08-27 14:27:55 -07:00
Srini Polavarapu 8c9af7464c Regenerate projects 2018-07-19 09:52:56 -07:00
Srini Polavarapu c79c156307 Regenrate projects 2018-06-08 17:01:18 -07:00
Muxi Yan 6df75c5989 podspec nit fix 2018-06-07 16:27:54 -07:00
Muxi Yan 08876dadce CFStream podspec 2018-06-06 20:06:35 -07:00
Mehrdad Afshari 2d43a45ad1 Regenerate projects 2018-05-02 22:49:52 -07:00
Mehrdad Afshari 90cfc8ed57 Regenerate projects 2018-04-04 14:04:11 -07:00
Mehrdad Afshari 9073ea03ef Regenerate projects 2018-02-22 22:21:33 -08:00
Mehrdad Afshari 43884047c9 Regenerate projects 2018-01-19 14:25:15 -08:00
Nicolas "Pixel" Noble 361f8108e4 Merge branch 'master' of https://github.com/grpc/grpc into upmerge-from-v1.7 2017-11-29 19:31:42 +01:00
Mehrdad Afshari 14e96f9ae8 Bump 1.8.0-dev to 1.9.0-dev 2017-11-27 17:14:15 -08:00
Alexander Polcyn 9f5163eb85 Bump v1.7.x branch to 1.7.2 2017-11-01 11:07:28 -07:00
Alexander Polcyn 40ba62f2a2 Bump v1.7.x branch to 1.7.1 2017-10-26 20:17:26 -07:00
Muxi Yan ed9929e246 Merge pull request #13100 from muxi/supress-strict-prototype-warning
Supress strict prototype warning in v1.7.x
2017-10-26 12:11:22 -07:00
Muxi Yan 94d669e022 Supress strict prototype warning in gRPC pods 2017-10-22 14:56:10 -07:00
Nicolas "Pixel" Noble 863a0500df Flagging 1.7.0 2017-10-21 01:48:27 +02:00
murgatroid99 90e9140211 1.7.x is now 1.7.0-pre1 2017-10-04 14:02:22 -07:00
murgatroid99 9887379158 Update version to 1.8.0-dev, update g word to 'generous' 2017-10-02 17:31:33 -07:00
David Garcia Quintas 713597f1cd Master version bump to 1.7.x 2017-08-16 20:59:05 -07:00
Mehrdad Afshari bb3d95b643 Use https://grpc.io consistently as the canonical URL 2017-07-10 22:24:28 +00:00
Jan Tattermusch 4d5c3102a1 fix remaining license notices 2017-06-08 11:22:41 +02:00
David Garcia Quintas aebcdbd732 master bumped to 1.5.x 2017-05-30 14:14:27 -07:00
David Garcia Quintas 9e1acc0796 master to 1.4.0-dev 2017-04-13 16:30:15 -07:00
Nicolas "Pixel" Noble e44a50ffd7 Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 2017-03-24 00:54:47 +01:00
Alexander Polcyn 3e30832cca bump v1.2.x branch to 1.2.1-pre1 2017-03-20 17:00:45 -07:00
David Garcia Quintas 69e5a28635 Going for 1.2.0 2017-03-20 12:51:17 -07:00
Muxi Yan 021fa52582 Merge pull request #10157 from muxi/advance-protoc-version
Advance ProtoCompiler version and fix podspecs
2017-03-17 01:03:54 -07:00
Muxi Yan 37d3fba391 Relieve ios deployment version to 7.0 2017-03-16 19:33:53 -07:00
Ken Payson 12ca7d319c Bump 1.2.x version to pre-2 2017-03-16 11:01:06 -07:00
David Garcia Quintas 904e7f53ae Introducing 1.2.0-pre1 2017-03-09 15:02:19 -08:00
David Garcia Quintas 74cec10619 Bumped version to 1.3.0-dev 2017-03-09 15:00:26 -08:00
Muxi Yan ed20a69939 Resolve generate_project failure 2017-02-06 13:42:58 -08:00
Muxi Yan 27e9db4393 Add modification warning to templated files 2017-01-30 09:22:30 -08:00
Muxi Yan 91bac1155d Empty line restore 2017-01-30 09:01:26 -08:00
Muxi Yan 690aee6d30 Automatedly advance ObjC version numbers 2017-01-27 04:18:26 +00:00
Muxi Yan a7f03f6423 Advance objective c version to v1.0.2 2016-11-28 11:29:19 -08:00
Muxi Yan 447d0a22e6 Advance versions of gRPC from v1.0.1-pre1 to v1.0.1 2016-10-25 14:14:12 -07:00
Muxi Yan 6758caae31 Advance versions from 1.0.0 to 1.0.1-pre1 2016-10-17 17:10:26 -07:00
Jorge Canizales 4a18c67b77 Move Podspecs to v1 2016-08-18 13:26:25 -07:00
Jorge Canizales 8ac55f8a8c Solve merge conflict at gRPC-ProtoRPC.podspec 2016-08-08 18:39:56 -07:00
Jorge Canizales a9b1c5cbe1 Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fix 2016-08-07 18:46:38 -07:00
Jorge Canizales e8f088e522 Remove obsolete template notices in podspecs 2016-08-03 15:37:56 -07:00
Jorge Canizales 72dce2dfbc Update podspecs to use Protobuf 3.0.0
The SwiftSample doesn’t build in this commit, but I need to sync with
head anyway so I’ll first merge v1.0.x into this branch and then debug.
2016-07-29 15:42:00 -07:00
Jorge Canizales f8c4580939 Commit as 1.0.0-pre1 so we can release already. 2016-07-18 17:51:31 -07:00
Jorge Canizales 854c167069 We’re done with the underscore tags for good!
Yay compatibility and predictability!
2016-07-18 12:30:01 -07:00
Jorge Canizales e4704d3eda “Allow non-modular includes in framework modules”
It’s the magic sentence that allows pods dependent on RxLibrary to be
archived correctly by XCode.

It’s less than ideal, and seems arbitrary (why RxLibrary specifically?),
so we’ll try to produce a minimal case and open an issue with it in the
Cocoapods repo.
2016-07-18 11:25:51 -07:00
Jorge Canizales 854b81a83b Advance versions from 0.14 -> 1.0
Pending:

- Tag BoringSSL repo.
- Tag gRPC repo.
- Build the plugin, zip it, and add it to the release.
- Push Cocoapods to trunk.
2016-07-15 11:23:48 -07:00
Jorge Canizales 565c6a0dac Bump Protobuf to beta-3.1 2016-06-23 14:22:12 -07:00
Jorge Canizales db502a7986 Update documentation and samples. 2016-06-08 19:21:58 -07:00
Jorge Canizales e487a7271d Separate Core, ProtoRuntime, and RxLibrary subspecs 2016-06-08 19:21:50 -07:00