Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7413 from jcanizales/p0-advance-versions-to-1

Browse Source 
Advance versions from 0.14 -> 1.0.0-pre1
pull/7424/head objective-c-v1.0.0-pre1
makdharma 9 years ago committed by GitHub
parent 0c5673d823 886eecf1e0
commit 5e93d3fffa
14 changed files with 261 additions and 253 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 6
      gRPC-Core.podspec
  5. 4
      gRPC-ProtoRPC.podspec
  6. 4
      gRPC-RxLibrary.podspec
  7. 4
      gRPC.podspec
  8. 4
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  9. 3
      src/objective-c/!ProtoCompiler.podspec
  10. 471
      src/objective-c/BoringSSL.podspec
  11. 2
      src/objective-c/README.md
  12. 2
      src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
  13. 2
      src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
  14. 6
      templates/gRPC-Core.podspec.template

2
examples/objective-c/auth_sample/AuthTestService.podspec
Unescape View File

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

2
examples/objective-c/helloworld/HelloWorld.podspec
Unescape View File

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

2
examples/objective-c/route_guide/RouteGuide.podspec
Unescape View File

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

6
gRPC-Core.podspec
Unescape View File

@ -35,7 +35,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-Core'
version = '0.14.0'
version = '1.0.0-pre1'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'http://www.grpc.io'
@ -44,7 +44,7 @@ Pod::Spec.new do |s|
s.source = {
:git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:tag => "objective-c-v#{version}",
# TODO(jcanizales): Depend explicitly on the nanopb pod, and disable submodules.
:submodules => true,
}
@ -191,7 +191,7 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.'
ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL', '~> 4.0'
ss.dependency 'BoringSSL', '~> 5.0'
# To save you from scrolling, this is the last part of the podspec.
ss.source_files = 'src/core/lib/profiling/timers.h',

4
gRPC-ProtoRPC.podspec
Unescape View File

@ -36,7 +36,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
version = '0.14.0'
version = '1.0.0-pre1'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'http://www.grpc.io'
@ -45,7 +45,7 @@ Pod::Spec.new do |s|
s.source = {
:git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:tag => "objective-c-v#{version}",
}
s.ios.deployment_target = '7.1'

4
gRPC-RxLibrary.podspec
Unescape View File

@ -36,7 +36,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
version = '0.14.0'
version = '1.0.0-pre1'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'http://www.grpc.io'
@ -45,7 +45,7 @@ Pod::Spec.new do |s|
s.source = {
:git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:tag => "objective-c-v#{version}",
}
s.ios.deployment_target = '7.1'

4
gRPC.podspec
Unescape View File

@ -36,7 +36,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC'
version = '0.14.0'
version = '1.0.0-pre1'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
@ -45,7 +45,7 @@ Pod::Spec.new do |s|
s.source = {
:git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:tag => "objective-c-v#{version}",
}
s.ios.deployment_target = '7.1'

4
src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Unescape View File

@ -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
# before them.
s.name = '!ProtoCompiler-gRPCPlugin'
v = '0.14.0'
v = '1.0.0-pre1'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC
@ -82,7 +82,7 @@ Pod::Spec.new do |s|
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }
repo = 'grpc/grpc'
release = 'release-0_14_1'
release = "objective-c-v#{v}"
file = "grpc_objective_c_plugin-#{v}-macos-x86_64.zip"
s.source = {
:http => "https://github.com/#{repo}/releases/download/#{release}/#{file}",

3
src/objective-c/!ProtoCompiler.podspec
Unescape View File

@ -97,10 +97,9 @@ Pod::Spec.new do |s|
s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
repo = 'google/protobuf'
release = "v#{v}"
file = "protoc-#{v}-osx-x86_64.zip"
s.source = {
:http => "https://github.com/#{repo}/releases/download/#{release}/#{file}",
:http => "https://github.com/#{repo}/releases/download/v#{v}/#{file}",
# TODO(jcanizales): Add sha1 or sha256
# :sha1 => '??',
}

471
src/objective-c/BoringSSL.podspec
Unescape View File

@ -31,7 +31,7 @@
Pod::Spec.new do |s|
s.name = 'BoringSSL'
version = '4.0'
version = '5.0'
s.version = version
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
# Adapted from the homepage:
@ -67,8 +67,11 @@ Pod::Spec.new do |s|
# "The name and email addresses of the library maintainers, not the Podspec maintainer."
s.authors = 'Adam Langley', 'David Benjamin', 'Matt Braithwaite'
s.source = { :git => 'https://boringssl.googlesource.com/boringssl',
:tag => "version_for_cocoapods_#{version}" }
s.source = {
:git => 'https://boringssl.googlesource.com/boringssl',
:tag => "version_for_cocoapods_#{version}",
# :commit => '8d343b44bbab829d1a28fdef650ca95f7db4412e',
}
name = 'openssl'
@ -219,7 +222,7 @@ Pod::Spec.new do |s|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
/* This file was generated by err_data_generate.go. */
/* This file was generated by err_data_generate.go. */
#include <openssl/base.h>
#include <openssl/err.h>
@ -385,42 +388,42 @@ Pod::Spec.new do |s|
0x28340c19,
0x283480ac,
0x283500ea,
0x2c322775,
0x2c32a783,
0x2c332795,
0x2c33a7a7,
0x2c3427bb,
0x2c34a7cd,
0x2c3527e8,
0x2c35a7fa,
0x2c36280d,
0x2c3227cb,
0x2c32a7d9,
0x2c3327eb,
0x2c33a7fd,
0x2c342811,
0x2c34a823,
0x2c35283e,
0x2c35a850,
0x2c362863,
0x2c36832d,
0x2c37281a,
0x2c37a82c,
0x2c38283f,
0x2c38a856,
0x2c392864,
0x2c39a874,
0x2c3a2886,
0x2c3aa89a,
0x2c3b28ab,
0x2c3ba8ca,
0x2c3c28de,
0x2c3ca8f4,
0x2c3d290d,
0x2c3da92a,
0x2c3e293b,
0x2c3ea949,
0x2c3f2961,
0x2c3fa979,
0x2c402986,
0x2c372870,
0x2c37a882,
0x2c382895,
0x2c38a8ac,
0x2c3928ba,
0x2c39a8ca,
0x2c3a28dc,
0x2c3aa8f0,
0x2c3b2901,
0x2c3ba920,
0x2c3c2934,
0x2c3ca94a,
0x2c3d2963,
0x2c3da980,
0x2c3e2991,
0x2c3ea99f,
0x2c3f29b7,
0x2c3fa9cf,
0x2c4029dc,
0x2c4090e7,
0x2c412997,
0x2c41a9aa,
0x2c4129ed,
0x2c41aa00,
0x2c4210c0,
0x2c42a9bb,
0x2c42aa11,
0x2c430720,
0x2c43a8bc,
0x2c43a912,
0x30320000,
0x30328015,
0x3033001f,
@ -594,145 +597,148 @@ Pod::Spec.new do |s|
0x404619e8,
0x40469a08,
0x40471a16,
0x40479a2a,
0x40481a3f,
0x40489a58,
0x40491a6f,
0x40499a89,
0x404a1aa0,
0x404a9abe,
0x404b1ad6,
0x404b9aed,
0x404c1b03,
0x404c9b15,
0x404d1b36,
0x404d9b58,
0x404e1b6c,
0x404e9b79,
0x404f1b90,
0x404f9ba0,
0x40501bca,
0x40509bde,
0x40511bf9,
0x40519c09,
0x40521c20,
0x40529c32,
0x40531c4a,
0x40539c5d,
0x40541c72,
0x40549c95,
0x40551ca3,
0x40559cc0,
0x40561ccd,
0x40569ce6,
0x40571cfe,
0x40579d11,
0x40581d26,
0x40589d38,
0x40591d48,
0x40599d61,
0x405a1d75,
0x405a9d85,
0x405b1d9d,
0x405b9dae,
0x405c1dc1,
0x405c9dd2,
0x405d1ddf,
0x405d9df6,
0x405e1e16,
0x40479a3d,
0x40481a52,
0x40489a6b,
0x40491a82,
0x40499a9c,
0x404a1ab3,
0x404a9ad1,
0x404b1ae9,
0x404b9b00,
0x404c1b16,
0x404c9b28,
0x404d1b49,
0x404d9b6b,
0x404e1b7f,
0x404e9b8c,
0x404f1ba3,
0x404f9bb3,
0x40501bdd,
0x40509bf1,
0x40511c0c,
0x40519c1c,
0x40521c33,
0x40529c45,
0x40531c5d,
0x40539c70,
0x40541c85,
0x40549ca8,
0x40551cb6,
0x40559cd3,
0x40561ce0,
0x40569cf9,
0x40571d11,
0x40579d24,
0x40581d39,
0x40589d4b,
0x40591d7a,
0x40599d93,
0x405a1da7,
0x405a9db7,
0x405b1dcf,
0x405b9de0,
0x405c1df3,
0x405c9e04,
0x405d1e11,
0x405d9e28,
0x405e1e48,
0x405e8a95,
0x405f1e37,
0x405f9e44,
0x40601e52,
0x40609e74,
0x40611e9c,
0x40619eb1,
0x40621ec8,
0x40629ed9,
0x40631eea,
0x40639eff,
0x40641f16,
0x40649f27,
0x40651f42,
0x40659f59,
0x40661f71,
0x40669f9b,
0x40671fc6,
0x40679fe7,
0x40681ffa,
0x4068a01b,
0x4069204d,
0x4069a07b,
0x406a209c,
0x406aa0bc,
0x406b2244,
0x406ba267,
0x406c227d,
0x406ca4a9,
0x406d24d8,
0x406da500,
0x406e2519,
0x406ea531,
0x406f2550,
0x406fa565,
0x40702578,
0x4070a595,
0x405f1e69,
0x405f9e76,
0x40601e84,
0x40609ea6,
0x40611ece,
0x40619ee3,
0x40621efa,
0x40629f0b,
0x40631f1c,
0x40639f31,
0x40641f48,
0x40649f59,
0x40651f74,
0x40659f8b,
0x40661fa3,
0x40669fcd,
0x40671ff8,
0x4067a019,
0x4068202c,
0x4068a04d,
0x4069207f,
0x4069a0ad,
0x406a20ce,
0x406aa0ee,
0x406b2276,
0x406ba299,
0x406c22af,
0x406ca4db,
0x406d250a,
0x406da532,
0x406e254b,
0x406ea563,
0x406f2582,
0x406fa597,
0x407025aa,
0x4070a5c7,
0x40710800,
0x4071a5a7,
0x407225ba,
0x4072a5d3,
0x407325eb,
0x4071a5d9,
0x407225ec,
0x4072a605,
0x4073261d,
0x4073936d,
0x407425ff,
0x4074a619,
0x4075262a,
0x4075a63e,
0x4076264c,
0x40742631,
0x4074a64b,
0x4075265c,
0x4075a670,
0x4076267e,
0x407691aa,
0x40772671,
0x4077a693,
0x407826ae,
0x4078a6c3,
0x407926da,
0x4079a6f0,
0x407a26fc,
0x407aa70f,
0x407b2724,
0x407ba736,
0x407c274b,
0x407ca754,
0x407d2036,
0x407d9bb0,
0x41f4216f,
0x41f92201,
0x41fe20f4,
0x41fea2d0,
0x41ff23c1,
0x42032188,
0x420821aa,
0x4208a1e6,
0x420920d8,
0x4209a220,
0x420a212f,
0x420aa10f,
0x420b214f,
0x420ba1c8,
0x420c23dd,
0x420ca29d,
0x420d22b7,
0x420da2ee,
0x42122308,
0x421723a4,
0x4217a34a,
0x421c236c,
0x421f2327,
0x422123f4,
0x42262387,
0x422b248d,
0x422ba456,
0x422c2475,
0x422ca430,
0x422d240f,
0x407726a3,
0x4077a6c5,
0x407826e0,
0x4078a719,
0x40792730,
0x4079a746,
0x407a2752,
0x407aa765,
0x407b277a,
0x407ba78c,
0x407c27a1,
0x407ca7aa,
0x407d2068,
0x407d9bc3,
0x407e26f5,
0x407e9d5b,
0x407f1a2a,
0x41f421a1,
0x41f92233,
0x41fe2126,
0x41fea302,
0x41ff23f3,
0x420321ba,
0x420821dc,
0x4208a218,
0x4209210a,
0x4209a252,
0x420a2161,
0x420aa141,
0x420b2181,
0x420ba1fa,
0x420c240f,
0x420ca2cf,
0x420d22e9,
0x420da320,
0x4212233a,
0x421723d6,
0x4217a37c,
0x421c239e,
0x421f2359,
0x42212426,
0x422623b9,
0x422b24bf,
0x422ba488,
0x422c24a7,
0x422ca462,
0x422d2441,
0x4432072b,
0x4432873a,
0x44330746,
@ -775,69 +781,69 @@ Pod::Spec.new do |s|
0x4c3d136d,
0x4c3d937c,
0x4c3e1389,
0x503229cd,
0x5032a9dc,
0x503329e7,
0x5033a9f7,
0x50342a10,
0x5034aa2a,
0x50352a38,
0x5035aa4e,
0x50362a60,
0x5036aa76,
0x50372a8f,
0x5037aaa2,
0x50382aba,
0x5038aacb,
0x50392ae0,
0x5039aaf4,
0x503a2b14,
0x503aab2a,
0x503b2b42,
0x503bab54,
0x503c2b70,
0x503cab87,
0x503d2ba0,
0x503dabb6,
0x503e2bc3,
0x503eabd9,
0x503f2beb,
0x50322a23,
0x5032aa32,
0x50332a3d,
0x5033aa4d,
0x50342a66,
0x5034aa80,
0x50352a8e,
0x5035aaa4,
0x50362ab6,
0x5036aacc,
0x50372ae5,
0x5037aaf8,
0x50382b10,
0x5038ab21,
0x50392b36,
0x5039ab4a,
0x503a2b6a,
0x503aab80,
0x503b2b98,
0x503babaa,
0x503c2bc6,
0x503cabdd,
0x503d2bf6,
0x503dac0c,
0x503e2c19,
0x503eac2f,
0x503f2c41,
0x503f8382,
0x50402bfe,
0x5040ac0e,
0x50412c28,
0x5041ac37,
0x50422c51,
0x5042ac6e,
0x50432c7e,
0x5043ac8e,
0x50442c9d,
0x50402c54,
0x5040ac64,
0x50412c7e,
0x5041ac8d,
0x50422ca7,
0x5042acc4,
0x50432cd4,
0x5043ace4,
0x50442cf3,
0x5044843f,
0x50452cb1,
0x5045accf,
0x50462ce2,
0x5046acf8,
0x50472d0a,
0x5047ad1f,
0x50482d45,
0x5048ad53,
0x50492d66,
0x5049ad7b,
0x504a2d91,
0x504aada1,
0x504b2dc1,
0x504badd4,
0x504c2df7,
0x504cae25,
0x504d2e37,
0x504dae54,
0x504e2e6f,
0x504eae8b,
0x504f2e9d,
0x504faeb4,
0x50502ec3,
0x50452d07,
0x5045ad25,
0x50462d38,
0x5046ad4e,
0x50472d60,
0x5047ad75,
0x50482d9b,
0x5048ada9,
0x50492dbc,
0x5049add1,
0x504a2de7,
0x504aadf7,
0x504b2e17,
0x504bae2a,
0x504c2e4d,
0x504cae7b,
0x504d2e8d,
0x504daeaa,
0x504e2ec5,
0x504eaee1,
0x504f2ef3,
0x504faf0a,
0x50502f19,
0x505086ef,
0x50512ed6,
0x50512f2c,
0x58320ec9,
0x68320e8b,
0x68328c25,
@ -1218,6 +1224,7 @@ Pod::Spec.new do |s|
"DH_PUBLIC_VALUE_LENGTH_IS_WRONG\\0"
"DH_P_TOO_LONG\\0"
"DIGEST_CHECK_FAILED\\0"
"DOWNGRADE_DETECTED\\0"
"DTLS_MESSAGE_TOO_BIG\\0"
"ECC_CERT_NOT_FOR_SIGNING\\0"
"EMS_STATE_INCONSISTENT\\0"
@ -1254,6 +1261,7 @@ Pod::Spec.new do |s|
"NO_CIPHERS_AVAILABLE\\0"
"NO_CIPHERS_PASSED\\0"
"NO_CIPHER_MATCH\\0"
"NO_COMMON_SIGNATURE_ALGORITHMS\\0"
"NO_COMPRESSION_SPECIFIED\\0"
"NO_METHOD_SPECIFIED\\0"
"NO_P256_SUPPORT\\0"
@ -1344,6 +1352,7 @@ Pod::Spec.new do |s|
"UNSUPPORTED_COMPRESSION_ALGORITHM\\0"
"UNSUPPORTED_ELLIPTIC_CURVE\\0"
"UNSUPPORTED_PROTOCOL\\0"
"UNSUPPORTED_PROTOCOL_FOR_CUSTOM_KEY\\0"
"WRONG_CERTIFICATE_TYPE\\0"
"WRONG_CIPHER_RETURNED\\0"
"WRONG_CURVE\\0"

2
src/objective-c/README.md
Unescape View File

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

2
src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
Unescape View File

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

2
src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
Unescape View File

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

6
templates/gRPC-Core.podspec.template
Unescape View File

@ -62,7 +62,7 @@
%>
Pod::Spec.new do |s|
s.name = 'gRPC-Core'
version = '0.14.0'
version = '1.0.0-pre1'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'http://www.grpc.io'
@ -71,7 +71,7 @@
s.source = {
:git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:tag => "objective-c-v#{version}",
# TODO(jcanizales): Depend explicitly on the nanopb pod, and disable submodules.
:submodules => true,
}
@ -147,7 +147,7 @@
ss.header_mappings_dir = '.'
ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL', '~> 4.0'
ss.dependency 'BoringSSL', '~> 5.0'
# To save you from scrolling, this is the last part of the podspec.
ss.source_files = ${ruby_multiline_list(grpc_private_files(libs), 22)}

Write Preview
Loading…
Cancel
Save