diff options
Diffstat (limited to 'gRPC.podspec')
-rw-r--r-- | gRPC.podspec | 106 |
1 files changed, 41 insertions, 65 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 69c370e2c0..1ee2198125 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '0.11.1' + version = '0.11.2' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'http://www.grpc.io' @@ -46,6 +46,7 @@ Pod::Spec.new do |s| 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' s.requires_arc = true @@ -66,37 +67,37 @@ Pod::Spec.new do |s| 'src/core/support/file.h', 'src/core/support/murmur_hash.h', 'src/core/support/stack_lockfree.h', - 'src/core/support/grpc_string.h', + 'src/core/support/string.h', 'src/core/support/string_win32.h', 'src/core/support/thd_internal.h', 'src/core/support/time_precise.h', - 'grpc/support/alloc.h', - 'grpc/support/atm.h', - 'grpc/support/atm_gcc_atomic.h', - 'grpc/support/atm_gcc_sync.h', - 'grpc/support/atm_win32.h', - 'grpc/support/cmdline.h', - 'grpc/support/cpu.h', - 'grpc/support/histogram.h', - 'grpc/support/host_port.h', - 'grpc/support/log.h', - 'grpc/support/log_win32.h', - 'grpc/support/port_platform.h', - 'grpc/support/slice.h', - 'grpc/support/slice_buffer.h', - 'grpc/support/string_util.h', - 'grpc/support/subprocess.h', - 'grpc/support/sync.h', - 'grpc/support/sync_generic.h', - 'grpc/support/sync_posix.h', - 'grpc/support/sync_win32.h', - 'grpc/support/thd.h', - 'grpc/support/grpc_time.h', - 'grpc/support/tls.h', - 'grpc/support/tls_gcc.h', - 'grpc/support/tls_msvc.h', - 'grpc/support/tls_pthread.h', - 'grpc/support/useful.h', + 'include/grpc/support/alloc.h', + 'include/grpc/support/atm.h', + 'include/grpc/support/atm_gcc_atomic.h', + 'include/grpc/support/atm_gcc_sync.h', + 'include/grpc/support/atm_win32.h', + 'include/grpc/support/cmdline.h', + 'include/grpc/support/cpu.h', + 'include/grpc/support/histogram.h', + 'include/grpc/support/host_port.h', + 'include/grpc/support/log.h', + 'include/grpc/support/log_win32.h', + 'include/grpc/support/port_platform.h', + 'include/grpc/support/slice.h', + 'include/grpc/support/slice_buffer.h', + 'include/grpc/support/string_util.h', + 'include/grpc/support/subprocess.h', + 'include/grpc/support/sync.h', + 'include/grpc/support/sync_generic.h', + 'include/grpc/support/sync_posix.h', + 'include/grpc/support/sync_win32.h', + 'include/grpc/support/thd.h', + 'include/grpc/support/time.h', + 'include/grpc/support/tls.h', + 'include/grpc/support/tls_gcc.h', + 'include/grpc/support/tls_msvc.h', + 'include/grpc/support/tls_pthread.h', + 'include/grpc/support/useful.h', 'src/core/support/alloc.c', 'src/core/support/cmdline.c', 'src/core/support/cpu_iphone.c', @@ -251,13 +252,13 @@ Pod::Spec.new do |s| 'src/core/census/aggregation.h', 'src/core/census/context.h', 'src/core/census/rpc_metric_id.h', - 'grpc/grpc_security.h', - 'grpc/byte_buffer.h', - 'grpc/byte_buffer_reader.h', - 'grpc/compression.h', - 'grpc/grpc.h', - 'grpc/status.h', - 'grpc/census.h', + 'include/grpc/grpc_security.h', + 'include/grpc/byte_buffer.h', + 'include/grpc/byte_buffer_reader.h', + 'include/grpc/compression.h', + 'include/grpc/grpc.h', + 'include/grpc/status.h', + 'include/grpc/census.h', 'src/core/httpcli/httpcli_security_connector.c', 'src/core/security/base64.c', 'src/core/security/client_auth_filter.c', @@ -527,6 +528,10 @@ Pod::Spec.new do |s| 'src/core/census/rpc_metric_id.h' ss.header_mappings_dir = '.' + # This isn't officially supported in Cocoapods. We've asked for an alternative: + # https://github.com/CocoaPods/CocoaPods/issues/4386 + ss.xcconfig = { 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/gRPC" ' + + '"$(PODS_ROOT)/Headers/Private/gRPC/include"' } ss.requires_arc = false ss.libraries = 'z' @@ -535,35 +540,6 @@ Pod::Spec.new do |s| # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' end - # This is a workaround for Cocoapods Issue #1437. - # It renames time.h and string.h to grpc_time.h and grpc_string.h. - # It needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run - # prepare_command's of subspecs. - # - # TODO(jcanizales): Try out others' solutions at Issue #1437. - s.prepare_command = <<-CMD - # Move contents of include up a level to avoid manually specifying include paths - cp -r "include/grpc" "." - - DIR_TIME="grpc/support" - BAD_TIME="$DIR_TIME/time.h" - GOOD_TIME="$DIR_TIME/grpc_time.h" - grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g - if [ -f "$BAD_TIME" ]; - then - mv -f "$BAD_TIME" "$GOOD_TIME" - fi - - DIR_STRING="src/core/support" - BAD_STRING="$DIR_STRING/string.h" - GOOD_STRING="$DIR_STRING/grpc_string.h" - grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g - if [ -f "$BAD_STRING" ]; - then - mv -f "$BAD_STRING" "$GOOD_STRING" - fi - CMD - # Objective-C wrapper around the core gRPC library. s.subspec 'GRPCClient' do |ss| src_dir = "#{objc_dir}/GRPCClient" |