diff --git a/.gitignore b/.gitignore
index bfbc3934649057244dec7384e2f6b68605f95358..5972f82dfcaf230533721d0367988968aa5de853 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,31 @@ portlog.txt
# gyp generated make files
*-gyp.mk
out
+
+# XCode
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+*.DS_Store
+
+# Objective-C generated files
+*.pbobjc.*
+*.pbrpc.*
+
+# Cocoapods artifacts
+# Podfile.lock and the workspace file are tracked, to ease deleting them. That's
+# needed to trigger "pod install" to rerun the preinstall commands.
+Pods/
diff --git a/gRPC.podspec b/gRPC.podspec
index 2c566f71843587a7a7a42389eaa621cd685375d8..b491d02c4afa8ccb0222173cbc9075f6aa58f168 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'
@@ -69,37 +69,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/profiling/basic_timers.c',
'src/core/profiling/stap_timers.c',
'src/core/support/alloc.c',
@@ -266,13 +266,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',
@@ -558,6 +558,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'
@@ -566,35 +570,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"
diff --git a/src/objective-c/.gitignore b/src/objective-c/.gitignore
deleted file mode 100644
index 15110668007aac5bed5435559639ddc4e38589d8..0000000000000000000000000000000000000000
--- a/src/objective-c/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-*.DS_Store
\ No newline at end of file
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index d1b55adabf954d7ca1931c800376a58ae59c443b..3b96fe28857a56194d41c0bbc4841ab037fbe063 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -5,7 +5,7 @@
# Please look at the templates directory instead.
# This file can be regenerated from the template by running
# tools/buildgen/generate_projects.sh
-
+
# Copyright 2015, Google Inc.
# All rights reserved.
#
@@ -34,36 +34,27 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
<%!
- bad_header_names = ('time.h', 'string.h')
- def fix_header_name(name):
- split_name = name.split('/')
- if split_name[-1] in bad_header_names:
- split_name[-1] = 'grpc_' + split_name[-1]
- if split_name[0] == 'include':
- split_name = split_name[1:]
- return '/'.join(split_name)
-
def grpc_files(libs):
out = []
for lib in libs:
if lib.name in ("grpc", "gpr"):
- out.extend(fix_header_name(h) for h in lib.get('headers', []))
- out.extend(fix_header_name(h) for h in lib.get('public_headers', []))
- out.extend(lib.get('src', []))
+ out += lib.get('headers', [])
+ out += lib.get('public_headers', [])
+ out += lib.get('src', [])
return out;
def grpc_private_headers(libs):
out = []
for lib in libs:
if lib.name in ("grpc", "gpr"):
- out.extend(lib.get('headers', []))
+ out += lib.get('headers', [])
return out
%>
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'
@@ -79,7 +70,7 @@
s.requires_arc = true
objc_dir = 'src/objective-c'
-
+
# Reactive Extensions library for iOS.
s.subspec 'RxLibrary' do |ss|
src_dir = "#{objc_dir}/RxLibrary"
@@ -87,71 +78,46 @@
ss.private_header_files = "#{src_dir}/private/*.h"
ss.header_mappings_dir = "#{objc_dir}"
end
-
+
# Core cross-platform gRPC library, written in C.
s.subspec 'C-Core' do |ss|
ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))}
-
+
ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))}
-
+
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'
ss.dependency 'OpenSSL', '~> 1.0.200'
-
+
# 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"
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}"
-
+
ss.dependency 'gRPC/C-Core'
ss.dependency 'gRPC/RxLibrary'
-
+
# Certificates, to be able to establish TLS connections:
ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
end
-
+
# 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}"
-
+
ss.dependency 'gRPC/GRPCClient'
ss.dependency 'gRPC/RxLibrary'
ss.dependency 'Protobuf', '~> 3.0.0-alpha-4'