From 3c92dfe34dccd5a8e98325d300d5784a68b0265b Mon Sep 17 00:00:00 2001 From: Benny Lyne Amorsen Date: Tue, 7 Jul 2026 15:01:05 +0200 Subject: [PATCH 1/2] Switch to Faraday 2 for the build environment to fix issue #118 --- Appraisals | 2 +- Gemfile | 6 +++--- gemfiles/faraday2.gemfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Appraisals b/Appraisals index d97b77a..08786ba 100644 --- a/Appraisals +++ b/Appraisals @@ -12,6 +12,6 @@ end appraise 'faraday2' do gem 'faraday', '< 3' - gem 'faraday-net_http_persistent' + gem 'faraday-net_http_persistent', '~> 2.3' remove_gem 'faraday_middleware' end diff --git a/Gemfile b/Gemfile index 4d41344..7c32cae 100644 --- a/Gemfile +++ b/Gemfile @@ -14,9 +14,9 @@ gem 'rspec' gem 'simplecov' gem 'warning' -# fallback to faraday 1.x in dev environment -gem 'faraday', '~> 1.10' -gem 'faraday_middleware' +# default to faraday 2.x in dev environment +gem 'faraday', '~> 2.14' +gem 'faraday-net_http_persistent', '~> 2.3' # Dev tools / linter gem 'rubocop', require: false diff --git a/gemfiles/faraday2.gemfile b/gemfiles/faraday2.gemfile index 6151da1..ffcbfe6 100644 --- a/gemfiles/faraday2.gemfile +++ b/gemfiles/faraday2.gemfile @@ -14,6 +14,6 @@ gem "rubocop", require: false gem "rubocop-performance", require: false gem "rubocop-rake", require: false gem "rubocop-rspec", require: false -gem "faraday-net_http_persistent" +gem "faraday-net_http_persistent", "~> 2.3" gemspec path: "../" From a23e6124439953684521be54455232cfc99106d2 Mon Sep 17 00:00:00 2001 From: Benny Lyne Amorsen Date: Wed, 8 Jul 2026 09:41:24 +0200 Subject: [PATCH 2/2] Require Ruby 3.0 for Rubocop --- .github/workflows/rspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index e25e0c0..5eb1afd 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.0' - name: Bundler run: bundle install