From d07aa2e2bfcee32d1633ce18158015a6fa55c828 Mon Sep 17 00:00:00 2001 From: shashank mehra Date: Tue, 30 Jan 2024 21:32:12 +0530 Subject: [PATCH] Remove support for Faraday 1.x. --- lib/rabbitmq/http/client.rb | 6 +----- rabbitmq_http_api_client.gemspec | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/rabbitmq/http/client.rb b/lib/rabbitmq/http/client.rb index fe42e1f..adda6c7 100644 --- a/lib/rabbitmq/http/client.rb +++ b/lib/rabbitmq/http/client.rb @@ -450,11 +450,7 @@ def initialize_connection(endpoint, options = {}) adapter = options.delete(:adapter) || Faraday.default_adapter @connection = Faraday.new(options) do |conn| - if Gem::Version.new(Faraday::VERSION) < Gem::Version.new("2.0") - conn.request :basic_auth, user, password - else - conn.request :authorization, :basic, user, password - end + conn.request :authorization, :basic, user, password conn.use Faraday::FollowRedirects::Middleware, :limit => 3 conn.use Faraday::Response::RaiseError diff --git a/rabbitmq_http_api_client.gemspec b/rabbitmq_http_api_client.gemspec index f25c5b8..aa00ad9 100644 --- a/rabbitmq_http_api_client.gemspec +++ b/rabbitmq_http_api_client.gemspec @@ -21,6 +21,6 @@ Gem::Specification.new do |gem| gem.add_dependency 'addressable', '~> 2.7' gem.add_dependency 'hashie', '~> 4.1' gem.add_dependency 'multi_json', '~> 1.15' - gem.add_dependency 'faraday', '>= 1.3', '< 3' + gem.add_dependency 'faraday', '~> 2.0' gem.add_dependency 'faraday-follow_redirects', '~> 0.3' end