commit bb160258407289e9ab0dbb60c7d369c801bb3311
author Jorge Canizales <jcanizales@google.com> Fri Jul 01 10:09:16 2016 -0700
committer Jorge Canizales <jcanizales@google.com> Fri Jul 01 10:09:16 2016 -0700
tree ccb7ac7dc37bff9a5638d25df4ef920cf2eeb542
parent 3bdaa5e72684a271445f945f3d6aa6ea33681dd1

Merge fixup: version, deployment target & spec name

gRPC.podspec

diff --git a/gRPC.podspec b/gRPC.podspec
index f5744cd..e5556cc 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -36,7 +36,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC'
-  version = '0.12.0'
+  version = '0.14.0'
   s.version  = version
   s.summary  = 'gRPC client library for iOS/OSX'
   s.homepage = 'http://www.grpc.io'

src/objective-c/CronetFramework.podspec

diff --git a/src/objective-c/CronetFramework.podspec b/src/objective-c/CronetFramework.podspec
index 20af764..3ebcacf 100644
--- a/src/objective-c/CronetFramework.podspec
+++ b/src/objective-c/CronetFramework.podspec
@@ -36,7 +36,7 @@
   s.license      = { :type => 'BSD' }
   s.vendored_framework = "Cronet.framework"
   s.author             = "The Chromium Authors"
-  s.ios.deployment_target = "8.0"
+  s.ios.deployment_target = "7.1"
   s.source       = { :http => 'https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework.zip' }
   s.preserve_paths = "Cronet.framework"
   s.public_header_files = "Cronet.framework/Headers/**/*{.h}"

src/objective-c/tests/Podfile

diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile
index 64b0009..30a3426 100644
--- a/src/objective-c/tests/Podfile
+++ b/src/objective-c/tests/Podfile
@@ -63,7 +63,7 @@
     target.build_configurations.each do |config|
       config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'YES'
     end
-    if target.name == 'gRPC'
+    if target.name == 'gRPC-Core'
       target.build_configurations.each do |config|
         # TODO(zyc) Remove this setting after the issue is resolved
         # GPR_UNREACHABLE_CODE causes "Control may reach end of non-void