Skip to content

Commit

Permalink
Merge pull request grpc#6355 from jcanizales/update-version
Browse files Browse the repository at this point in the history
Move podspec to version 0.13
  • Loading branch information
makdharma committed Apr 29, 2016
2 parents 0657d61 + b3bad59 commit 768c769
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
7 changes: 4 additions & 3 deletions gRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@

Pod::Spec.new do |s|
s.name = 'gRPC'
version = '0.12.0'
version = '0.13.0'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
s.license = 'New BSD'
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }

s.source = { :git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}" }
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:submodules => true }


s.ios.deployment_target = '7.1'
Expand Down Expand Up @@ -629,7 +630,7 @@ Pod::Spec.new do |s|

ss.requires_arc = false
ss.libraries = 'z'
ss.dependency 'BoringSSL', '~> 2.0'
ss.dependency 'BoringSSL', '~> 3.0'

# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end
Expand Down
4 changes: 2 additions & 2 deletions src/objective-c/BoringSSL.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

Pod::Spec.new do |s|
s.name = 'BoringSSL'
s.version = '2.0'
s.version = '3.0'
s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
# Adapted from the homepage:
s.description = <<-DESC
Expand Down Expand Up @@ -67,7 +67,7 @@ Pod::Spec.new do |s|
s.authors = 'Adam Langley', 'David Benjamin', 'Matt Braithwaite'

s.source = { :git => 'https://boringssl.googlesource.com/boringssl',
:tag => 'version_for_cocoapods_2.0' }
:tag => 'version_for_cocoapods_3.0' }

s.source_files = 'ssl/*.{h,c}',
'ssl/**/*.{h,c}',
Expand Down
7 changes: 4 additions & 3 deletions templates/gRPC.podspec.template
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@
%>
Pod::Spec.new do |s|
s.name = 'gRPC'
version = '0.12.0'
version = '0.13.0'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
s.license = 'New BSD'
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }

s.source = { :git => 'https://github.com/grpc/grpc.git',
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}" }
:tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
:submodules => true }


s.ios.deployment_target = '7.1'
Expand Down Expand Up @@ -97,7 +98,7 @@

ss.requires_arc = false
ss.libraries = 'z'
ss.dependency 'BoringSSL', '~> 2.0'
ss.dependency 'BoringSSL', '~> 3.0'

# ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
end
Expand Down

0 comments on commit 768c769

Please sign in to comment.