Specify correct minimal Faraday version (#73)

lostisland · Apr 19, 2022 · 0249c51 · 0249c51
1 parent b3ae36b
commit 0249c51
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 13 deletions.
diff --git a/.gemfiles/faraday-0.gemfile b/.gemfiles/faraday-0.gemfile
diff --git a/.gemfiles/faraday-1.gemfile b/.gemfiles/faraday-1.gemfile
diff --git a/.gemfiles/faraday-2.gemfile b/.gemfiles/faraday-2.gemfile
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,12 +13,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/.gemfiles/${{ matrix.gemfile }}.gemfile
+      FARADAY_VERSION: ${{ matrix.faraday }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.7', '3.0', '3.1', 'truffleruby', 'jruby' ]
-        gemfile: [ 'faraday-0', 'faraday-1', 'faraday-2' ]
+        faraday: [ '~> 0.17.3', '~> 1.0', '~> 2.0' ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/Gemfile b/Gemfile
@@ -2,8 +2,12 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rake'
+gem "rake"
 
 group :test do
   gem "minitest"
 end
+
+install_if -> { ENV["FARADAY_VERSION"] } do
+  gem "faraday", ENV["FARADAY_VERSION"]
+end
diff --git a/sawyer.gemspec b/sawyer.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/lostisland/sawyer'
   spec.licenses = ['MIT']
 
-  spec.add_dependency 'faraday', ">= 0.9", "< 3"
+  spec.add_dependency 'faraday', '>= 0.17.3', '< 3'
   spec.add_dependency 'addressable', ['>= 2.3.5']
 
   spec.files = %w(Gemfile LICENSE.md README.md Rakefile)