20862: Merge branch 'main' into 20862-google-api-client

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 3834690078a13ca5821e6d141a8c05b6c9ec10d3..adfaa2ecb5de65c21522bf7aea1f7fed44fcb075 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -7,6 +7,9 @@ source 'https://rubygems.org'
 gem 'rails', '~> 5.2.0'
 gem 'responders', '~> 2.0'
 
+# i18n 1.14.1 seems to be incompatible with rails 5
+gem 'i18n', '~> 0.9.5'
+
 # Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2
 # See: https://github.com/rails/sprockets-rails/issues/443
 gem 'sprockets', '~> 3.0'
@@ -49,11 +52,9 @@ gem 'optimist'
 
 gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
 
-# Import arvados gem.
-gem 'arvados', '~> 2.1.5'
+gem 'arvados', '~> 2.7.0.rc1'
 gem 'httpclient'
 
-gem 'sshkey'
 gem 'safe_yaml'
 gem 'lograge'
 gem 'logstash-event'
@@ -65,10 +66,6 @@ gem 'rails-controller-testing'
 
 gem 'mini_portile2', '~> 2.8', '>= 2.8.1'
 
-# arvados-google-api-client and googleauth depend on signet, but
-# signet 0.12 is incompatible with ruby 2.3.
-gem 'signet', '< 0.12'
-
 # Install any plugin gems
 Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
     eval(IO.read(f), binding)