Update podspecs to use Protobuf 3.0.0

The SwiftSample doesn’t build in this commit, but I need to sync with
head anyway so I’ll first merge v1.0.x into this branch and then debug.
pull/7475/head
Jorge Canizales 9 years ago
parent 4343c904e2
commit 72dce2dfbc
  1. 2
      examples/objective-c/auth_sample/AuthTestService.podspec
  2. 2
      examples/objective-c/helloworld/HelloWorld.podspec
  3. 2
      examples/objective-c/route_guide/RouteGuide.podspec
  4. 2
      gRPC-ProtoRPC.podspec
  5. 4
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  6. 4
      src/objective-c/!ProtoCompiler.podspec
  7. 2
      src/objective-c/README.md
  8. 2
      src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
  9. 2
      src/objective-c/tests/RemoteTestClient/RemoteTest.podspec

@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos" src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods' pods_root = 'Pods'

@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos" src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods' pods_root = 'Pods'

@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos" src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods' pods_root = 'Pods'

@ -61,7 +61,7 @@ Pod::Spec.new do |s|
s.dependency 'gRPC', version s.dependency 'gRPC', version
s.dependency 'gRPC-RxLibrary', version s.dependency 'gRPC-RxLibrary', version
s.dependency 'Protobuf', '~> 3.0.0-beta-3.1' s.dependency 'Protobuf', '~> 3.0'
# This is needed by all pods that depend on Protobuf: # This is needed by all pods that depend on Protobuf:
s.pod_target_xcconfig = { s.pod_target_xcconfig = {
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1',

@ -37,7 +37,7 @@ Pod::Spec.new do |s|
# before them. # before them.
s.name = '!ProtoCompiler-gRPCPlugin' s.name = '!ProtoCompiler-gRPCPlugin'
v = '1.0.0-pre1' v = '1.0.0-pre1'
s.version = "#{v}.1" # .1 to depend on protoc 3.0.0-beta-4 s.version = "#{v}.2" # .2 to depend on protoc 3.0.0
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC s.description = <<-DESC
This podspec only downloads the gRPC protoc plugin so that local pods generating protos can use This podspec only downloads the gRPC protoc plugin so that local pods generating protos can use
@ -96,7 +96,7 @@ Pod::Spec.new do |s|
s.preserve_paths = plugin s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin. # Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.0.0-beta-4' s.dependency '!ProtoCompiler', '3.0.0'
# For the Protobuf dependency not to complain: # For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.1' s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'

@ -36,7 +36,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them. # before them.
s.name = '!ProtoCompiler' s.name = '!ProtoCompiler'
v = '3.0.0-beta-4' v = '3.0.0'
s.version = v s.version = v
s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
s.description = <<-DESC s.description = <<-DESC
@ -108,7 +108,7 @@ Pod::Spec.new do |s|
'google/**/*.proto' # Well-known protobuf types 'google/**/*.proto' # Well-known protobuf types
# Restrict the protobuf runtime version to the one supported by this version of protoc. # Restrict the protobuf runtime version to the one supported by this version of protoc.
s.dependency 'Protobuf', v s.dependency 'Protobuf', '~> 3.0'
# For the Protobuf dependency not to complain: # For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.1' s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'

@ -48,7 +48,7 @@ Pod::Spec.new do |s|
src = '.' src = '.'
# We'll use protoc with the gRPC plugin. # We'll use protoc with the gRPC plugin.
s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.0.0-pre1' s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.0.0-pre1.2'
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec. # Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = '<path to your Podfile>/Pods' pods_root = '<path to your Podfile>/Pods'

@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
repo_root = '../../../..' repo_root = '../../../..'
bin_dir = "#{repo_root}/bins/$CONFIG" bin_dir = "#{repo_root}/bins/$CONFIG"

@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.1" s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
repo_root = '../../../..' repo_root = '../../../..'
bin_dir = "#{repo_root}/bins/$CONFIG" bin_dir = "#{repo_root}/bins/$CONFIG"

Loading…
Cancel
Save