diff options
| author |  Michael Lumish <mlumish@google.com> | 2015-09-29 14:36:38 -0700 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2015-09-29 14:36:38 -0700 |
| commit | fa69f192ff7ac197ca24a3afb2ab11a2f4b9f262 (patch) | |
| tree | 38dae7cf7c15e841890c71a292e4deb4babad363 | |
| parent | ba2829edf05e03411ea3b22bc64ccd46587a0a98 (diff) | |
| parent | 423f412ab8bda7704d8f8376b28e6d80cda505a1 (diff) | |
Merge pull request #3567 from jcanizales/fix-podspec
Make podspec lint pass for submitting ObjC beta to Cocoapods
| -rw-r--r-- | gRPC.podspec | 7 | ||||
| -rw-r--r-- | include/grpc/support/port_platform.h | 2 | ||||
| -rw-r--r-- | src/core/iomgr/udp_server.c | 2 | ||||
| -rw-r--r-- | templates/gRPC.podspec.template | 10 |
4 files changed, 11 insertions, 10 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 4edc3e5dc7..69c370e2c0 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -36,14 +36,15 @@ Pod::Spec.new do |s| s.name = 'gRPC' - s.version = '0.11.0' + version = '0.11.1' + s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'http://www.grpc.io' s.license = 'New BSD' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # s.source = { :git => 'https://github.com/grpc/grpc.git', - # :tag => 'release-0_11_0-objectivec-0.11.0' } + 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' diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h index d09815557e..69ff18eed6 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h @@ -174,8 +174,6 @@ #endif /* _LP64 */ #elif defined(__APPLE__) #include <TargetConditionals.h> -/* Provides IPV6_RECVPKTINFO */ -#define __APPLE_USE_RFC_3542 #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c index 6429c38b28..3aec1e871c 100644 --- a/src/core/iomgr/udp_server.c +++ b/src/core/iomgr/udp_server.c @@ -235,7 +235,7 @@ static int prepare_socket(int fd, const struct sockaddr *addr, int addr_len) { rc = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, sizeof(get_local_ip)); if (rc == 0 && addr->sa_family == AF_INET6) { -#if !TARGET_OS_IPHONE +#if !defined(__APPLE__) rc = setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip, sizeof(get_local_ip)); #endif diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index b1de0d7102..d1b55adabf 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -63,14 +63,16 @@ %> Pod::Spec.new do |s| s.name = 'gRPC' - s.version = '0.11.0' + version = '0.11.1' + s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'http://www.grpc.io' s.license = 'New BSD' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - - # s.source = { :git => 'https://github.com/grpc/grpc.git', - # :tag => 'release-0_11_0-objectivec-0.11.0' } + + 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' |