From: Lucas Di Pentima Date: Wed, 20 Mar 2019 17:39:03 +0000 (-0300) Subject: 14873: Updates arvados & arvados-cli gems dependency on google-api-client. X-Git-Tag: 1.4.0~103^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8c0178f2ff01a284ac4bebbc664b9fb7f64cdc38 14873: Updates arvados & arvados-cli gems dependency on google-api-client. Start using our own fork arvados-google-api-client that ask for activesupport version <5.1 so that it doesn't block the rails 5 upgrade. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec index c7e20e2a72..60aeb1892b 100644 --- a/sdk/cli/arvados-cli.gemspec +++ b/sdk/cli/arvados-cli.gemspec @@ -33,8 +33,8 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'arvados', '~> 1.3.0', '>= 1.3.0' # Our google-api-client dependency used to be < 0.9, but that could be # satisfied by the buggy 0.9.pre*. https://dev.arvados.org/issues/9213 - s.add_runtime_dependency 'cure-google-api-client', '~> 0.6', '>= 0.6.3', '<0.8.9' - s.add_runtime_dependency 'activesupport', '>= 3.2.13', '< 5' + s.add_runtime_dependency 'arvados-google-api-client', '~> 0.6', '>= 0.6.3', '<0.8.9' + s.add_runtime_dependency 'activesupport', '>= 3.2.13', '< 5.1' s.add_runtime_dependency 'json', '>= 1.7.7', '<3' s.add_runtime_dependency 'optimist', '~> 3.0' s.add_runtime_dependency 'andand', '~> 1.3', '>= 1.3.3' diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec index da919309f4..d4f04eb370 100644 --- a/sdk/ruby/arvados.gemspec +++ b/sdk/ruby/arvados.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |s| s.add_dependency('andand', '~> 1.3', '>= 1.3.3') # Our google-api-client dependency used to be < 0.9, but that could be # satisfied by the buggy 0.9.pre*. https://dev.arvados.org/issues/9213 - s.add_dependency('cure-google-api-client', '>= 0.7', '< 0.8.9') + s.add_dependency('arvados-google-api-client', '>= 0.7', '< 0.8.9') # work around undeclared dependency on i18n in some activesupport 3.x.x: s.add_dependency('i18n', '~> 0') s.add_dependency('json', '>= 1.7.7', '<3')