From 53c516d88d48bafee5bd125a368352dd94f5fdad Mon Sep 17 00:00:00 2001
From: Jeremy Daer <jeremydaer@gmail.com>
Date: Thu, 28 Sep 2017 21:54:00 -0700
Subject: redis-rb 4.0 support

* Use `gem 'redis', '~> 4.0'` for new app Gemfiles
* Loosen Action Cable redis-rb dep to `>= 3.3, < 5`
* Bump redis-namespace for looser Redis version dep
* Avoid using the underlying `redis.client` directly
* Use `Redis.new` instead of `Redis.connect`
---
 Gemfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 96207e022f..aaf55f18c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,8 +61,8 @@ gem "bootsnap", ">= 1.1.0", require: false
 # Active Job.
 group :job do
   gem "resque", require: false
-  gem "resque-scheduler", require: false
-  gem "sidekiq", require: false
+  gem "resque-scheduler", github: "jeremy/resque-scheduler", branch: "redis-rb-4.0", require: false
+  gem "sidekiq", github: "mperham/sidekiq", require: false
   gem "sucker_punch", require: false
   gem "delayed_job", require: false
   gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
@@ -82,7 +82,10 @@ group :cable do
 
   gem "em-hiredis", require: false
   gem "hiredis", require: false
-  gem "redis", require: false
+  gem "redis", "~> 4.0", require: false
+
+  # For Redis 4.0 support. Unreleased 9cb81bf.
+  gem "redis-namespace", github: "resque/redis-namespace"
 
   gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
 
-- 
cgit v1.2.3