From 690385b796e7d4b7e6f599f470209bba54c7d8bf Mon Sep 17 00:00:00 2001
From: Kirill Platonov <mail@kirillplatonov.com>
Date: Thu, 18 Dec 2025 17:29:10 +0100
Subject: [PATCH 1/3] Fix deprecation warnings for Rails 7.1+

---
 lib/shopify_app/logger.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/shopify_app/logger.rb b/lib/shopify_app/logger.rb
index d225d5b6a..d8c2a90bd 100644
--- a/lib/shopify_app/logger.rb
+++ b/lib/shopify_app/logger.rb
@@ -8,7 +8,11 @@ def deprecated(message, version)
 
         raise ShopifyAPI::Errors::FeatureDeprecatedError unless valid_version(version)
 
-        ActiveSupport::Deprecation.warn("[#{version}] #{context(:warn)} #{message}")
+        deprecator.warn("[#{version}] #{context(:warn)} #{message}")
+      end
+
+      def deprecator
+        @deprecator ||= ActiveSupport::Deprecation.new(ShopifyApp::VERSION, "ShopifyApp")
       end
 
       private

From 5640da1ea252fe17ab1cb9c1f933ab21b6acc575 Mon Sep 17 00:00:00 2001
From: Kirill Platonov <mail@kirillplatonov.com>
Date: Thu, 18 Dec 2025 17:33:56 +0100
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6c9ae88b..3633e1f01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 Unreleased
 ----------
 
+- Fix deprecation warnings for Rails 7.1+ [#2041](https://github.com/Shopify/shopify_app/pull/2041)
+
 23.0.0 (December 11, 2025)
+----------
 - ⚠️ [Breaking] Bumps minimum supported Rails version to 7.1 & Ruby version to 3.2; moves jobs from `lib` to `app` to fix loading issues with modern rails versions. [#2020](https://github.com/Shopify/shopify_app/pull/2020)
   - ActiveJob classes moved from `lib/shopify_app/jobs/` to `app/jobs/shopify_app/` to follow Rails conventions and fix timing issues with ActiveJob initialization
   - Jobs are now autoloaded by Rails instead of explicitly required during gem initialization

From 0beab2d138e67ca66e35c0aceb4acc9d30d5b876 Mon Sep 17 00:00:00 2001
From: Kirill Platonov <mail@kirillplatonov.com>
Date: Fri, 19 Dec 2025 22:40:43 +0100
Subject: [PATCH 3/3] Make Logger.deprecator method private

---
 lib/shopify_app/logger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/shopify_app/logger.rb b/lib/shopify_app/logger.rb
index d8c2a90bd..8500d0db6 100644
--- a/lib/shopify_app/logger.rb
+++ b/lib/shopify_app/logger.rb
@@ -11,12 +11,12 @@ def deprecated(message, version)
         deprecator.warn("[#{version}] #{context(:warn)} #{message}")
       end
 
+      private
+
       def deprecator
         @deprecator ||= ActiveSupport::Deprecation.new(ShopifyApp::VERSION, "ShopifyApp")
       end
 
-      private
-
       def context(log_level)
         current_shop = ShopifyAPI::Context.active_session&.shop || "Shop Not Found"
         "[ ShopifyApp | #{log_level.to_s.upcase} | #{current_shop} ]"