From 3c67d934261ceab4245471646e9084a3262d555d Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 14 Aug 2025 14:15:02 +0200
Subject: [PATCH] chore: update sidekiq-cron and revert temporary compatibility
 fix

- Update sidekiq-cron from 1.12.0 to 2.3.1 with Rails 7.2 compatibility
- Update sidekiq from 7.3.1 to 7.3.9
- Restore require 'sidekiq/cron/web' as compatibility is now built-in
- Remove temporary FIXME workaround comments
---
 Gemfile          |  2 +-
 Gemfile.lock     | 21 +++++++++++++--------
 config/routes.rb |  4 +---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8b34b152d..d804909e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,7 +122,7 @@ gem 'sentry-sidekiq', '>= 5.19.0', require: false
 ##-- background job processing --##
 gem 'sidekiq', '>= 7.3.1'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 1.12.0'
+gem 'sidekiq-cron', '>= 2.3.1'
 # for sidekiq healthcheck
 gem 'sidekiq_alive'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a1722dd8..34b69e92d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,6 +157,9 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
+    cronex (0.15.0)
+      tzinfo
+      unicode (>= 0.4.4.5)
     csv (3.3.0)
     csv-safe (3.3.1)
       csv (~> 3.0)
@@ -210,7 +213,7 @@ GEM
     email_reply_trimmer (0.1.13)
     erb (5.0.2)
     erubi (1.13.1)
-    et-orbi (1.2.11)
+    et-orbi (1.3.0)
       tzinfo
     event_stream_parser (1.0.0)
     execjs (2.8.1)
@@ -615,7 +618,7 @@ GEM
       psych (>= 4.0.0)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.22.2)
+    redis-client (0.25.2)
       connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)
@@ -761,16 +764,17 @@ GEM
       zeitwerk (~> 2.5)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.3.1)
-      concurrent-ruby (< 2)
+    sidekiq (7.3.9)
+      base64
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
       redis-client (>= 0.22.2)
-    sidekiq-cron (1.12.0)
-      fugit (~> 1.8)
+    sidekiq-cron (2.3.1)
+      cronex (>= 0.13.0)
+      fugit (~> 1.8, >= 1.11.1)
       globalid (>= 1.0.1)
-      sidekiq (>= 6)
+      sidekiq (>= 6.5.0)
     sidekiq_alive (2.5.0)
       gserver (~> 0.0.1)
       sidekiq (>= 5, < 9)
@@ -836,6 +840,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
+    unicode (0.4.4.5)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
@@ -1004,7 +1009,7 @@ DEPENDENCIES
   shopify_api
   shoulda-matchers
   sidekiq (>= 7.3.1)
-  sidekiq-cron (>= 1.12.0)
+  sidekiq-cron (>= 2.3.1)
   sidekiq_alive
   simplecov (= 0.17.1)
   slack-ruby-client (~> 2.5.2)
diff --git a/config/routes.rb b/config/routes.rb
index 5be206edf..10749062e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -524,9 +524,7 @@ Rails.application.routes.draw do
   # ----------------------------------------------------------------------
   # Internal Monitoring Routes
   require 'sidekiq/web'
-  # FIXME: remove after https://github.com/sidekiq-cron/sidekiq-cron/pull/531/files is merged
-  # We need before we merge the PR
-  # require 'sidekiq/cron/web'
+  require 'sidekiq/cron/web'
 
   devise_for :super_admins, path: 'super_admin', controllers: { sessions: 'super_admin/devise/sessions' }
   devise_scope :super_admin do