Merge pull request #4959 from grpc/release-0_12

Release 0.12 -> master
pull/4933/head^2
Michael Lumish 9 years ago
commit 5441c222e3
  1. 2
      gRPC.podspec
  2. 4
      src/objective-c/BoringSSL.podspec
  3. 2
      templates/gRPC.podspec.template

@ -605,7 +605,7 @@ Pod::Spec.new do |s|
ss.requires_arc = false ss.requires_arc = false
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency 'BoringSSL', '~> 1.0' ss.dependency 'BoringSSL', '~> 2.0'
# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end end

@ -31,7 +31,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'BoringSSL' s.name = 'BoringSSL'
s.version = '1.0' s.version = '2.0'
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.' s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
# Adapted from the homepage: # Adapted from the homepage:
s.description = <<-DESC s.description = <<-DESC
@ -67,7 +67,7 @@ Pod::Spec.new do |s|
s.authors = 'Adam Langley', 'David Benjamin', 'Matt Braithwaite' s.authors = 'Adam Langley', 'David Benjamin', 'Matt Braithwaite'
s.source = { :git => 'https://boringssl.googlesource.com/boringssl', s.source = { :git => 'https://boringssl.googlesource.com/boringssl',
:tag => 'version_for_cocoapods_1.0' } :tag => 'version_for_cocoapods_2.0' }
s.source_files = 'ssl/*.{h,c}', s.source_files = 'ssl/*.{h,c}',
'ssl/**/*.{h,c}', 'ssl/**/*.{h,c}',

@ -97,7 +97,7 @@
ss.requires_arc = false ss.requires_arc = false
ss.libraries = 'z' ss.libraries = 'z'
ss.dependency 'BoringSSL', '~> 1.0' ss.dependency 'BoringSSL', '~> 2.0'
# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end end

Loading…
Cancel
Save