diff options
author | 2016-07-13 15:40:24 -0700 | |
---|---|---|
committer | 2016-07-13 15:40:24 -0700 | |
commit | 22ac0d17c13a02ef4400700f5fe1af43c78d4931 (patch) | |
tree | 5c45770eaedb68fdbe42b5e5f54ae47446f61402 /gRPC.podspec | |
parent | c8a8513d5911e99241ec0bb7b038d4344110cb41 (diff) | |
parent | 8da7b1f779b36394008aad5ef40f49b03ce79c7b (diff) |
Merge branch 'delayed-write' into grand-unified-closures
Diffstat (limited to 'gRPC.podspec')
-rw-r--r-- | gRPC.podspec | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 4f2203c7a5..a37c8357a8 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -43,13 +43,14 @@ Pod::Spec.new do |s| s.license = 'New BSD' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - s.source = { :git => 'https://github.com/grpc/grpc.git', - :tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}", - :submodules => true } - + s.source = { + :git => 'https://github.com/grpc/grpc.git', + :tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}", + } s.ios.deployment_target = '7.1' s.osx.deployment_target = '10.9' +<<<<<<< HEAD s.requires_arc = true objc_dir = 'src/objective-c' @@ -730,22 +731,21 @@ Pod::Spec.new do |s| ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}" ss.private_header_files = "#{src_dir}/private/*.h" ss.header_mappings_dir = "#{objc_dir}" +======= +>>>>>>> 8da7b1f779b36394008aad5ef40f49b03ce79c7b - ss.dependency 'gRPC/C-Core' - ss.dependency 'gRPC/RxLibrary' + name = 'GRPCClient' + s.module_name = name + s.header_dir = name - # Certificates, to be able to establish TLS connections: - ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] } - end + src_dir = 'src/objective-c/GRPCClient' + s.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}" + s.private_header_files = "#{src_dir}/private/*.h" + s.header_mappings_dir = "#{src_dir}" - # RPC library for ProtocolBuffers, based on gRPC - s.subspec 'ProtoRPC' do |ss| - src_dir = "#{objc_dir}/ProtoRPC" - ss.source_files = "#{src_dir}/*.{h,m}" - ss.header_mappings_dir = "#{objc_dir}" + s.dependency 'gRPC-Core', version + s.dependency 'gRPC-RxLibrary', version - ss.dependency 'gRPC/GRPCClient' - ss.dependency 'gRPC/RxLibrary' - ss.dependency 'Protobuf', '~> 3.0.0-alpha-4' - end + # Certificates, to be able to establish TLS connections: + s.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] } end |