From 45f89a4a308867601b614d1d11d41166469abcf5 Mon Sep 17 00:00:00 2001
From: Theo Truong <theotr@amazon.com>
Date: Mon, 3 Feb 2025 16:44:40 -0700
Subject: [PATCH] #

Signed-off-by: Theo Truong <theotr@amazon.com>
---
 .github/workflows/main.yml |  2 +-
 Gemfile                    | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 56f840a23..3e44fe360 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,7 +48,7 @@ jobs:
     env:
       TEST_OPENSEARCH_SERVER: http://localhost:9250
       PORT: 9250
-      FARADAY_VERSION: '~> 1.0'
+      FARADAY_VERSION: '~> 1'
     strategy:
       fail-fast: false
       matrix:
diff --git a/Gemfile b/Gemfile
index 1edfa3201..a5f55b713 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ source 'https://rubygems.org'
 
 gem 'opensearch-ruby', path: __dir__, require: false
 
+# TODO: remove unnecessary dependencies
 gem 'ansi'
 gem 'bundler'
 gem 'cane'
@@ -54,15 +55,19 @@ gem 'typhoeus', '~> 1.4'
 gem 'webmock', '~> 2.0'
 gem 'yard'
 
-gem 'curb' unless defined? JRUBY_VERSION
-gem 'faraday-patron' unless defined? JRUBY_VERSION
-gem 'patron' unless defined? JRUBY_VERSION
+if defined? JRUBY_VERSION
+  gem 'manticore'
+  gem 'pry-nav'
+else
+  gem 'curb'
+  gem 'faraday-patron'
+  gem 'patron'
+  gem 'require-prof'
+  gem 'ruby-prof'
+end
 
-gem 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
-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', 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')
+if ENV.key?('FARADAY_VERSION')
+  gem 'faraday', ENV.fetch('FARADAY_VERSION'), require: false
+else
+  gem 'faraday-typhoeus'
+end