Adjust version requirements through samples and tests.

pull/4210/head
Jorge Canizales 10 years ago
parent d1908b10dd
commit e3d9db2667
  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.podspec
  5. 10
      src/objective-c/README.md
  6. 6
      src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
  7. 8
      src/objective-c/tests/RemoteTestClient/RemoteTest.podspec

@ -29,7 +29,7 @@ Pod::Spec.new do |s|
ss.source_files = "#{dir}/*.pbrpc.{h,m}", "#{dir}/**/*.pbrpc.{h,m}" ss.source_files = "#{dir}/*.pbrpc.{h,m}", "#{dir}/**/*.pbrpc.{h,m}"
ss.header_mappings_dir = dir ss.header_mappings_dir = dir
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC", "~> 0.11" ss.dependency "gRPC", "~> 0.12"
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
end end

@ -29,7 +29,7 @@ Pod::Spec.new do |s|
ss.source_files = "#{dir}/*.pbrpc.{h,m}", "#{dir}/**/*.pbrpc.{h,m}" ss.source_files = "#{dir}/*.pbrpc.{h,m}", "#{dir}/**/*.pbrpc.{h,m}"
ss.header_mappings_dir = dir ss.header_mappings_dir = dir
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC", "~> 0.11" ss.dependency "gRPC", "~> 0.12"
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
end end

@ -29,7 +29,7 @@ Pod::Spec.new do |s|
ss.source_files = "#{dir}/*.pbrpc.{h,m}", "#{dir}/**/*.pbrpc.{h,m}" ss.source_files = "#{dir}/*.pbrpc.{h,m}", "#{dir}/**/*.pbrpc.{h,m}"
ss.header_mappings_dir = dir ss.header_mappings_dir = dir
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC", "~> 0.11" ss.dependency "gRPC", "~> 0.12"
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
end end

@ -575,7 +575,7 @@ Pod::Spec.new do |s|
ss.requires_arc = false ss.requires_arc = false
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency 'OpenSSL', '~> 1.0.200' ss.dependency 'OpenSSL', '~> 1.0.204.1'
# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end end

@ -48,8 +48,8 @@ Pod::Spec.new do |s|
s.version = '0.0.1' s.version = '0.0.1'
s.license = '...' s.license = '...'
s.ios.deployment_target = '6.0' s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.8' 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.
# You can run this command manually if you later change your protos and need to regenerate. # You can run this command manually if you later change your protos and need to regenerate.
@ -60,7 +60,7 @@ Pod::Spec.new do |s|
ms.source_files = "*.pbobjc.{h,m}" ms.source_files = "*.pbobjc.{h,m}"
ms.header_mappings_dir = "." ms.header_mappings_dir = "."
ms.requires_arc = false ms.requires_arc = false
ms.dependency "Protobuf", "~> 3.0.0-alpha-3" ms.dependency "Protobuf", "~> 3.0.0-alpha-4"
end end
# The --objcgrpc_out plugin generates a pair of .pbrpc.h/.pbrpc.m files for each .proto file with # The --objcgrpc_out plugin generates a pair of .pbrpc.h/.pbrpc.m files for each .proto file with
@ -69,7 +69,7 @@ Pod::Spec.new do |s|
ss.source_files = "*.pbrpc.{h,m}" ss.source_files = "*.pbrpc.{h,m}"
ss.header_mappings_dir = "." ss.header_mappings_dir = "."
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC", "~> 0.5" ss.dependency "gRPC", "~> 0.12"
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
end end
@ -156,7 +156,7 @@ _protoc_, in which case no system modification nor renaming is necessary.
You need to compile the generated `.pbobjc.*` files (the enums and messages) without ARC support, You need to compile the generated `.pbobjc.*` files (the enums and messages) without ARC support,
and the generated `.pbrpc.*` files (the services) with ARC support. The generated code depends on and the generated `.pbrpc.*` files (the services) with ARC support. The generated code depends on
v0.5+ of the Objective-C gRPC runtime library and v3.0.0-alpha-3+ of the Objective-C Protobuf v0.12+ of the Objective-C gRPC runtime library and v3.0.0-alpha-4+ of the Objective-C Protobuf
runtime library. runtime library.
These libraries need to be integrated into your project as described in their respective Podspec These libraries need to be integrated into your project as described in their respective Podspec

@ -3,8 +3,8 @@ Pod::Spec.new do |s|
s.version = "0.0.1" s.version = "0.0.1"
s.license = "New BSD" s.license = "New BSD"
s.ios.deployment_target = "6.0" s.ios.deployment_target = '7.1'
s.osx.deployment_target = "10.8" 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.prepare_command = <<-CMD s.prepare_command = <<-CMD
@ -22,7 +22,7 @@ Pod::Spec.new do |s|
ss.source_files = "*.pbrpc.{h,m}" ss.source_files = "*.pbrpc.{h,m}"
ss.header_mappings_dir = "." ss.header_mappings_dir = "."
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC", "~> 0.7" ss.dependency "gRPC", "~> 0.12"
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
end end

@ -3,8 +3,8 @@ Pod::Spec.new do |s|
s.version = "0.0.1" s.version = "0.0.1"
s.license = "New BSD" s.license = "New BSD"
s.ios.deployment_target = "6.0" s.ios.deployment_target = '7.1'
s.osx.deployment_target = "10.8" 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.prepare_command = <<-CMD s.prepare_command = <<-CMD
@ -18,14 +18,14 @@ Pod::Spec.new do |s|
ms.source_files = "*.pbobjc.{h,m}" ms.source_files = "*.pbobjc.{h,m}"
ms.header_mappings_dir = "." ms.header_mappings_dir = "."
ms.requires_arc = false ms.requires_arc = false
ms.dependency "Protobuf", "~> 3.0.0-alpha-3" ms.dependency "Protobuf", "~> 3.0.0-alpha-4"
end end
s.subspec "Services" do |ss| s.subspec "Services" do |ss|
ss.source_files = "*.pbrpc.{h,m}" ss.source_files = "*.pbrpc.{h,m}"
ss.header_mappings_dir = "." ss.header_mappings_dir = "."
ss.requires_arc = true ss.requires_arc = true
ss.dependency "gRPC", "~> 0.5" ss.dependency "gRPC", "~> 0.12"
ss.dependency "#{s.name}/Messages" ss.dependency "#{s.name}/Messages"
end end
end end

Loading…
Cancel
Save