Use external multipart and retry middleware

.github/workflows/ci.yml

@@ -2,9 +2,8 @@ name: CI
 
 on:
   pull_request:
-
   push:
-    branches: [main, 0.1x]
+    branches: [main, 0.1x, 1.x]
 
 env:
   GIT_COMMIT_SHA: ${{ github.sha }}
@@ -43,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
 
     steps:
     - uses: actions/checkout@v1

.rubocop.yml

@@ -8,7 +8,7 @@ require:
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Inclusivity/Race:
   Enabled: true

faraday.gemspec

@@ -13,17 +13,18 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.homepage = 'https://lostisland.github.io/faraday'
   spec.licenses = ['MIT']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'faraday-em_http', '~> 1.0'
   spec.add_dependency 'faraday-em_synchrony', '~> 1.0'
   spec.add_dependency 'faraday-excon', '~> 1.1'
-  spec.add_dependency 'faraday-httpclient', '~> 1.0.1'
-  spec.add_dependency 'faraday-net_http'
-  spec.add_dependency 'faraday-net_http_persistent', '~> 1.1'
-  spec.add_dependency 'faraday-patron', '~> 1.0'
+  spec.add_dependency 'faraday-httpclient', '< 3'
+  spec.add_dependency 'faraday-multipart', '~> 1.0'
+  spec.add_dependency 'faraday-net_http', '< 3'
+  spec.add_dependency 'faraday-net_http_persistent', '< 3'
+  spec.add_dependency 'faraday-patron', '< 3'
   spec.add_dependency 'faraday-rack', '~> 1.0'
-  spec.add_dependency 'multipart-post', '>= 1.2', '< 3'
+  spec.add_dependency 'faraday-retry', '~> 1.0'
   spec.add_dependency 'ruby2_keywords', '>= 0.0.4'
 
   # Includes `examples` and `spec` to allow external adapter gems to run Faraday unit and integration tests

lib/faraday.rb

@@ -24,9 +24,13 @@
 require 'faraday/request'
 require 'faraday/response'
 require 'faraday/error'
-require 'faraday/file_part'
-require 'faraday/param_part'
+require 'faraday/request/url_encoded' # needed by multipart
 
+# External Middleware gems
+require 'faraday/multipart'
+require 'faraday/retry'
+
+# External Adapters gems
 unless defined?(JRUBY_VERSION)
   require 'faraday/em_http'
   require 'faraday/em_synchrony'

lib/faraday/error.rb

@@ -143,10 +143,4 @@ class SSLError < Error
   # Raised by FaradayMiddleware::ResponseMiddleware
   class ParsingError < Error
   end
-
-  # Exception used to control the Retry middleware.
-  #
-  # @see Faraday::Request::Retry
-  class RetriableResponse < Error
-  end
 end