Merge branch '22647-postinst-ignores-gem-install-errors'

[arvados.git] / sdk / ruby-google-api-client / arvados-google-api-client.gemspec

diff --git a/sdk/ruby-google-api-client/arvados-google-api-client.gemspec b/sdk/ruby-google-api-client/arvados-google-api-client.gemspec
index 70277bbf7969195c2995de07279da95683663042..1c2c00632c18a390c120c4e133f8eca24a0c4e99 100644 (file)
--- a/sdk/ruby-google-api-client/arvados-google-api-client.gemspec
+++ b/sdk/ruby-google-api-client/arvados-google-api-client.gemspec
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = "arvados-google-api-client"
   s.version = Google::APIClient::VERSION::STRING
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = ">= 1.3.5"
   s.require_paths = ["lib"]
   s.authors = ["Bob Aman", "Steven Bazyl"]
@@ -26,15 +26,13 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'addressable', '~> 2.3'
   s.add_runtime_dependency 'signet', '~> 0.16.0'
-  # faraday requires Ruby 3.0 starting with 2.9.0. If you install this gem
-  # on Ruby 2.7, the dependency resolver asks you to resolve the conflict
-  # manually. Instead of teaching all our tooling to do that, we prefer to
-  # require the latest version that supports Ruby 2.7 here. This requirement
-  # can be relaxed to '~> 2.0' when we drop support for Ruby 2.7.
+  # faraday stopped supporting Ruby 2.7 with its 2.9.0 release.
+  # Force a resolution that supports all our Rubies:
   s.add_runtime_dependency 'faraday', '~> 2.8.0'
   s.add_runtime_dependency 'faraday-multipart', '~> 1.0'
   s.add_runtime_dependency 'faraday-gzip', '~> 2.0'
-  s.add_runtime_dependency 'googleauth', '~> 1.0'
+  # googleauth stopped supporting Ruby 2.7 in 1.2.0 (due to a new dependency).
+  s.add_runtime_dependency 'googleauth', '~> 1.1.0'
   s.add_runtime_dependency 'multi_json', '~> 1.10'
   s.add_runtime_dependency 'autoparse', '~> 0.3'
   s.add_runtime_dependency 'extlib', '~> 0.9'
@@ -42,6 +40,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'retriable', '~> 1.4'
   s.add_runtime_dependency 'activesupport', '>= 3.2', '< 8.0'
 
+  # These are indirect dependencies of the above where we force a resolution
+  # that supports all our Rubies.
+  s.add_runtime_dependency 'google-cloud-env', '~> 2.1.0'
+  s.add_runtime_dependency 'public_suffix', '~> 5.0'
+
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'yard', '~> 0.8'
   s.add_development_dependency 'rspec', '~> 3.1'