Skip to content

Commit

Permalink
Reverted Gemfile update
Browse files Browse the repository at this point in the history
Signed-off-by: Theo Truong <theotr@amazon.com>
  • Loading branch information
nhtruong committed Jul 28, 2023
1 parent de56178 commit c461fce
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ gem 'opensearch-ruby', path: __dir__, require: false
gem 'ansi'
gem 'bundler'
gem 'cane'
gem 'faraday-httpclient', '~> 1'
gem 'faraday-net_http_persistent', '~> 1'
gem 'faraday-httpclient'
gem 'faraday-net_http_persistent'
gem 'hashie'
gem 'httpclient'
gem 'jbuilder'
Expand All @@ -54,8 +54,8 @@ gem 'typhoeus', '~> 1.4'
gem 'webmock', '~> 2.0'
gem 'yard'

gem 'curb', '~> 0.9' unless defined? JRUBY_VERSION
gem 'faraday-patron', '~> 1' unless defined? JRUBY_VERSION
gem 'curb' unless defined? JRUBY_VERSION
gem 'faraday-patron' unless defined? JRUBY_VERSION
gem 'patron' unless defined? JRUBY_VERSION

gem 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
Expand All @@ -64,5 +64,5 @@ gem 'ruby-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
gem 'manticore' if defined? JRUBY_VERSION
gem 'pry-nav' if defined? JRUBY_VERSION

gem 'faraday', ENV.fetch('FARADAY_VERSION', '~> 1'), require: false if ENV.key?('FARADAY_VERSION')
gem 'faraday-typhoeus', '~> 1' if !ENV.key?('FARADAY_VERSION') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
gem 'faraday', ENV.fetch('FARADAY_VERSION', nil), require: false if ENV.key?('FARADAY_VERSION')
gem 'faraday-typhoeus' if !ENV.key?('FARADAY_VERSION') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')

0 comments on commit c461fce

Please sign in to comment.