20318: Fix arvados-login-sync and arvados-cli dependencies.

Previous requirement '~> 2.7.0.rc1' excluded the current prerelease
version '2.8.0.dev20231214204948' that the test suite deliberately
installs ahead of time, so bundler overrode that and selected the last
released published version 2.7.1 from rubygems, which is not
compatible with Ruby 3.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 665e8ecf14523bd4b3a0cc8f27a2595a8c261b76..3a856c4f5147a5acddf32bc34b02bbecc8844a01 100644 (file)
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.executables << "arv"
   s.executables << "arv-tag"
   s.required_ruby_version = '>= 2.5.0'
-  s.add_runtime_dependency 'arvados', '~> 2.7.0.rc1'
+  s.add_runtime_dependency 'arvados', '~> 2.8.a'
   # arvados fork of google-api-client gem with old API and new
   # compatibility fixes, built from ../ruby-google-api-client/
   s.add_runtime_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.9')

diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index ce16283c3f4e114b0110e654854c26a1b8fd950c..008f13d8b862662fd95b8e751cb4c1a13d2a2280 100644 (file)
--- a/services/login-sync/arvados-login-sync.gemspec
+++ b/services/login-sync/arvados-login-sync.gemspec
@@ -37,14 +37,14 @@ Gem::Specification.new do |s|
   s.files       = ["bin/arvados-login-sync", "agpl-3.0.txt"]
   s.executables << "arvados-login-sync"
   s.required_ruby_version = '>= 2.5.0'
-  # Note the letter 'a' at the end of the version dependency. This enables
-  # bundler's dependency resolver to include 'pre-release' versions, like the
-  # ones we build (but not publish) on every test pipeline job.
-  # See: https://github.com/rubygems/bundler/issues/4340
-  s.add_runtime_dependency 'arvados', '~> 2.7.0.rc1'
+  # 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'
-  # We need at least version 0.8.7.3, cf. https://dev.arvados.org/issues/15673
-  s.add_dependency('arvados-google-api-client', '>= 0.8.7.3', '< 0.8.9')
+  # 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