X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c7b9ab80e1b33a108c55a23b3dfe793a73ecc95..be61dec610e6cfd400c3e616eb3a30a062e25116:/sdk/ruby/arvados.gemspec

diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 9a24414bb8..6446cd9269 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -13,7 +13,12 @@ begin
   ENV["GIT_DIR"] = File.expand_path "#{__dir__}/../../.git"
   ENV["GIT_WORK_TREE"] = File.expand_path "#{__dir__}/../.."
   git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H #{__dir__}`.chomp.split(":")
-  version = `#{__dir__}/../../build/version-at-commit.sh #{git_hash}`.encode('utf-8').strip
+  if ENV["ARVADOS_BUILDING_VERSION"]
+    version = ENV["ARVADOS_BUILDING_VERSION"]
+  else
+    version = `#{__dir__}/../../build/version-at-commit.sh #{git_hash}`.encode('utf-8').strip
+  end
+  version = version.sub("~dev", ".dev").sub("~rc", ".rc")
   git_timestamp = Time.at(git_timestamp.to_i).utc
 ensure
   ENV["GIT_DIR"] = git_dir
@@ -27,22 +32,21 @@ Gem::Specification.new do |s|
   s.summary     = "Arvados client library"
   s.description = "Arvados client library, git commit #{git_hash}"
   s.authors     = ["Arvados Authors"]
-  s.email       = 'gem-dev@curoverse.com'
+  s.email       = 'packaging@arvados.org'
   s.licenses    = ['Apache-2.0']
   s.files       = ["lib/arvados.rb", "lib/arvados/google_api_client.rb",
                    "lib/arvados/collection.rb", "lib/arvados/keep.rb",
                    "README", "LICENSE-2.0.txt"]
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 2.5.0'
   s.add_dependency('activesupport', '>= 3')
   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('arvados-google-api-client', '>= 0.7', '< 0.8.9')
+  # satisfied by the buggy 0.9.pre*, cf. https://dev.arvados.org/issues/9213
+  # We need at least version 0.8.7.5 for compatibility with faraday >= 1.0.
+  s.add_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.8')
   # work around undeclared dependency on i18n in some activesupport 3.x.x:
-  s.add_dependency('i18n', '~> 0')
+  s.add_dependency('i18n')
   s.add_dependency('json', '>= 1.7.7', '<3')
-  # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2
-  s.add_dependency('faraday', '< 0.16')
   s.add_runtime_dependency('jwt', '<2', '>= 0.1.5')
   s.homepage    =
     'https://arvados.org'