From 3b8b0d16f11efa040281d94dda19b6f4713f0791 Mon Sep 17 00:00:00 2001 From: Prasanna Pendse Date: Wed, 12 Jan 2022 10:37:19 +0530 Subject: [PATCH 1/3] Upgraded all dependencies to their latest versions. --- mountebank.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mountebank.gemspec b/mountebank.gemspec index 39edaa7..27b739d 100644 --- a/mountebank.gemspec +++ b/mountebank.gemspec @@ -18,11 +18,11 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "faraday", "~>0.9.0" + spec.add_runtime_dependency "faraday", "~>2.0.0" spec.add_runtime_dependency "faraday_middleware" - spec.add_development_dependency "bundler", "~> 1.7" - spec.add_development_dependency "rake", "~> 10.0" - spec.add_development_dependency "dotenv", "~> 1.0.0" + spec.add_development_dependency "bundler", "~> 2.3" + spec.add_development_dependency "rake", "~> 13.0" + spec.add_development_dependency "dotenv", "~> 2.7.6" spec.add_development_dependency "rspec" spec.add_development_dependency "pry" end From 8f06a2ab4a214dc301fa70083352d974478d692c Mon Sep 17 00:00:00 2001 From: Prasanna Pendse Date: Wed, 12 Jan 2022 10:40:22 +0530 Subject: [PATCH 2/3] Downgraded faraday and upgraded faraday_middleware to ensure compatibility --- mountebank.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mountebank.gemspec b/mountebank.gemspec index 27b739d..0961c5c 100644 --- a/mountebank.gemspec +++ b/mountebank.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "faraday", "~>2.0.0" - spec.add_runtime_dependency "faraday_middleware" + spec.add_runtime_dependency "faraday", "~>1.0.0" + spec.add_runtime_dependency "faraday_middleware", "~>1.2.0" spec.add_development_dependency "bundler", "~> 2.3" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "dotenv", "~> 2.7.6" From 4eea2be7ee64c7152c933dfe18ef0be041442c5e Mon Sep 17 00:00:00 2001 From: Prasanna Pendse Date: Wed, 12 Jan 2022 12:47:17 +0530 Subject: [PATCH 3/3] Upgraded to Faraday 2.0 and removed dependency on faraday_middleware which is deprecated --- lib/mountebank/helper.rb | 2 +- lib/mountebank/network.rb | 1 - mountebank.gemspec | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/mountebank/helper.rb b/lib/mountebank/helper.rb index 083ea40..765aae4 100644 --- a/lib/mountebank/helper.rb +++ b/lib/mountebank/helper.rb @@ -34,6 +34,6 @@ def call(environment) end if ::Faraday::Middleware.respond_to? :register_middleware - ::Faraday::Response.register_middleware :symbolize_keys => lambda { Mountebank::SymbolizeKeys } + ::Faraday::Response.register_middleware :symbolize_keys => Mountebank::SymbolizeKeys end end diff --git a/lib/mountebank/network.rb b/lib/mountebank/network.rb index 6a41380..9d77b41 100644 --- a/lib/mountebank/network.rb +++ b/lib/mountebank/network.rb @@ -1,5 +1,4 @@ require 'faraday' -require 'faraday_middleware' module Mountebank class Network diff --git a/mountebank.gemspec b/mountebank.gemspec index 0961c5c..a85c71b 100644 --- a/mountebank.gemspec +++ b/mountebank.gemspec @@ -18,8 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "faraday", "~>1.0.0" - spec.add_runtime_dependency "faraday_middleware", "~>1.2.0" + spec.add_runtime_dependency "faraday", "~>2.0.0" spec.add_development_dependency "bundler", "~> 2.3" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "dotenv", "~> 2.7.6"