diff --git a/Gemfile b/Gemfile index f9b51a792e..6d5a3d54af 100644 --- a/Gemfile +++ b/Gemfile @@ -169,7 +169,7 @@ gem 'alaveteli_features', path: 'gems/alaveteli_features' # Storage backends gem 'aws-sdk-s3', require: false -gem 'google-cloud-storage', '~> 1.47', require: false +gem 'google-cloud-storage', '~> 1.52', require: false # Storage content analyzers gem 'excel_analyzer', path: 'gems/excel_analyzer', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 23d615b315..3ef56ce9a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,8 +203,12 @@ GEM railties (>= 5.0.0) fancybox-rails (0.3.1) railties (>= 3.1.0) - faraday (0.17.6) - multipart-post (>= 1.2, < 3) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-net_http (3.3.0) + net-http fast_gettext (3.1.0) prime fivemat (1.3.7) @@ -232,35 +236,36 @@ GEM activerecord (>= 4.2, < 7.2) request_store (~> 1.0) gnuplot (2.6.2) - google-apis-core (0.11.2) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) + googleauth (~> 1.9) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.31.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) + google-apis-iamcredentials_v1 (0.22.0) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-storage_v1 (0.47.0) + google-apis-core (>= 0.15.0, < 2.a) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.47.0) + google-cloud-env (2.2.1) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.4.0) + google-cloud-storage (1.52.0) addressable (~> 2.8) digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.31.0) + google-apis-core (~> 0.13) + google-apis-iamcredentials_v1 (~> 0.18) + google-apis-storage_v1 (~> 0.38) google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) + googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + googleauth (1.11.2) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -290,7 +295,8 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.7.5) - jwt (2.7.1) + jwt (2.9.3) + base64 language_server-protocol (3.17.0.3) launchy (3.0.1) addressable (~> 2.8) @@ -328,7 +334,9 @@ GEM money (6.19.0) i18n (>= 0.6.4, <= 2) multi_json (1.15.0) - multipart-post (2.3.0) + mutex_m (0.2.0) + net-http (0.5.0) + uri net-imap (0.5.0) date net-protocol @@ -497,7 +505,7 @@ GEM redis (>= 4.5.0, < 5) sidekiq-limit_fetch (4.4.1) sidekiq (>= 6) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -541,6 +549,7 @@ GEM unicode-display_width (2.6.0) unidecoder (1.1.2) uniform_notifier (1.16.0) + uri (1.0.1) vpim (24.2.20) web-console (4.2.1) actionview (>= 6.0.0) @@ -551,7 +560,6 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -601,7 +609,7 @@ DEPENDENCIES gettext_i18n_rails (~> 1.13.0) globalize (~> 6.3.0) gnuplot (~> 2.6.0) - google-cloud-storage (~> 1.47) + google-cloud-storage (~> 1.52) holidays (~> 8.8.0) htmlentities (~> 4.3.0) i18n (~> 1.14.6)