Remove deprecated usages and update gems (#104)

* Remove deprecated usages and update gems * Update ChangeLog * Update sidekiq version
deliveroo · Feb 13, 2023 · 7f39d2e · 7f39d2e
1 parent 30d335f
commit 7f39d2e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   build_2.5_rails_5:
     docker:
-      - image: circleci/ruby:2.4.1
+      - image: circleci/ruby:2.7.4
       - image: redis:3-alpine
     steps:
       - checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 _A description of your awesome changes here!_
 
+Features:
+
+- Add ruby 3 compability
+
+Bug fixes:
+
+- Explictly set sidekiq gem version
+- Update circleci base image
+- Remove `require 'faraday/request/retry'` dependency since its deprecated in faraday `1.10.3`.
+
 ### 3.7.0
 
 Features:

diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,7 @@ gem 'dotenv',                     require: false
 gem 'simplecov',                  require: false
 gem 'codecov',                    require: false
 gem 'resque',                     require: false
-gem 'sidekiq',                    require: false
+gem 'sidekiq', '~> 5.2.10',       require: false
 
 gem 'guard-rspec',                require: false
 gem 'pry',                        require: false

diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
@@ -11,7 +11,7 @@ gem "dotenv", :require => false
 gem "simplecov", :require => false
 gem "codecov", :require => false
 gem "resque", :require => false
-gem "sidekiq", :require => false
+gem "sidekiq", '~> 5.2.10', :require => false
 gem "guard-rspec", :require => false
 gem "pry", :require => false
 gem "byebug", :require => false

diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -11,7 +11,7 @@ gem "dotenv", :require => false
 gem "simplecov", :require => false
 gem "codecov", :require => false
 gem "resque", :require => false
-gem "sidekiq", :require => false
+gem "sidekiq", '~> 5.2.10', :require => false
 gem "guard-rspec", :require => false
 gem "pry", :require => false
 gem "byebug", :require => false

diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile
@@ -11,7 +11,7 @@ gem "dotenv", :require => false
 gem "simplecov", :require => false
 gem "codecov", :require => false
 gem "resque", :require => false
-gem "sidekiq", :require => false
+gem "sidekiq", '~> 5.2.10', :require => false
 gem "guard-rspec", :require => false
 gem "pry", :require => false
 gem "byebug", :require => false

diff --git a/lib/routemaster/api_client.rb b/lib/routemaster/api_client.rb
@@ -22,7 +22,6 @@
 # prevents Faraday's magic class loading pixie dust from tripping over itself in
 # multithreaded use cases.
 require 'uri'
-require 'faraday/request/retry'
 require 'faraday_middleware/request/encode_json'
 require 'faraday_middleware/response/parse_json'
 require 'faraday_middleware/response/mashify'
@@ -73,7 +72,7 @@ def get(url, params: {}, headers: {}, options: {})
     # Same as {{get}}, except with
     def fget(url, **options)
       uri = _assert_uri(url)
-      Responses::ResponsePromise.new { get(uri, options) }
+      Responses::ResponsePromise.new { get(uri, **options) }
     end
 
     def patch(url, body: {}, headers: {})