Merge branch '21216-multiplier-typo-fix' refs #21216

[arvados.git] / services / login-sync / arvados-login-sync.gemspec

diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index b45f8692be5b83254318c3b9edc3854ebade9913..008f13d8b862662fd95b8e751cb4c1a13d2a2280 100644 (file)
--- a/services/login-sync/arvados-login-sync.gemspec
+++ b/services/login-sync/arvados-login-sync.gemspec
@@ -18,6 +18,7 @@ begin
   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
@@ -31,18 +32,19 @@ Gem::Specification.new do |s|
   s.summary     = "Set up local login accounts for Arvados users"
   s.description = "Creates and updates local login accounts for Arvados users. Built from git commit #{git_hash}"
   s.authors     = ["Arvados Authors"]
-  s.email       = 'gem-dev@curoverse.com'
+  s.email       = 'packaging@arvados.org'
   s.licenses    = ['AGPL-3.0']
   s.files       = ["bin/arvados-login-sync", "agpl-3.0.txt"]
   s.executables << "arvados-login-sync"
-  s.required_ruby_version = '>= 2.1.0'
-  s.add_runtime_dependency 'arvados', '~> 1.3.0', '>= 1.3.0'
+  s.required_ruby_version = '>= 2.5.0'
+  # The minimum version's 'a' suffix is necessary to enable bundler
+  # to consider 'pre-release' versions.  See:
+  # https://github.com/rubygems/bundler/issues/4340
+  s.add_runtime_dependency 'arvados', '~> 2.8.a'
   s.add_runtime_dependency 'launchy', '< 2.5'
-  # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2
-  s.add_dependency('faraday', '< 0.16')
-  # arvados-google-api-client (and thus arvados) gems
-  # depend on signet, but signet 0.12 is incompatible with ruby 2.3.
-  s.add_dependency('signet', '< 0.12')
+  # arvados fork of google-api-client gem with old API and new
+  # compatibility fixes, built from ../../sdk/ruby-google-api-client/
+  s.add_runtime_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.9')
   s.homepage    =
     'https://arvados.org'
 end