From f4ba40a71ebacc857dc8dd40c86d32c31ecc52ea Mon Sep 17 00:00:00 2001
From: Sam Bostock <sam.bostock@shopify.com>
Date: Thu, 19 Jun 2025 14:26:55 -0400
Subject: [PATCH 1/2] Consistently organize development dependencies

---
 .rubocop.yml |  3 +++
 Gemfile      | 17 ++++++++++++-----
 mcp.gemspec  |  5 -----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 71716a95..dbe4b369 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,3 +4,6 @@ inherit_gem:
 plugins:
   - rubocop-minitest
   - rubocop-rake
+
+Gemspec/DevelopmentDependencies:
+  Enabled: true
diff --git a/Gemfile b/Gemfile
index 2d01b7eb..c8a7a26e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,11 +7,18 @@ gemspec
 
 # Specify development dependencies below
 gem "minitest", "~> 5.1", require: false
-gem "rake", "~> 13.0"
-gem "rubocop-minitest"
-gem "rubocop-rake"
-gem "rubocop-shopify", require: false
-
 gem "minitest-reporters"
 gem "mocha"
+
+gem "rubocop-minitest", require: false
+gem "rubocop-rake", require: false
+gem "rubocop-shopify", require: false
+
+gem "puma", ">= 5.0.0"
+gem "rack", ">= 2.0.0"
+gem "rackup", ">= 2.1.0"
+
+gem "activesupport"
 gem "debug"
+gem "rake", "~> 13.0"
+gem "sorbet-static-and-runtime"
diff --git a/mcp.gemspec b/mcp.gemspec
index ae0262d9..ccbb63e7 100644
--- a/mcp.gemspec
+++ b/mcp.gemspec
@@ -29,9 +29,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("json_rpc_handler", "~> 0.1")
   spec.add_dependency("json-schema", "~> 4.1")
-  spec.add_development_dependency("activesupport")
-  spec.add_development_dependency("puma", ">= 5.0.0")
-  spec.add_development_dependency("rack", ">= 2.0.0")
-  spec.add_development_dependency("rackup", ">= 2.1.0")
-  spec.add_development_dependency("sorbet-static-and-runtime")
 end

From 6935db486e0ca2db0d7ec22ade930515a8452851 Mon Sep 17 00:00:00 2001
From: Sam Bostock <sam.bostock@shopify.com>
Date: Thu, 19 Jun 2025 14:28:09 -0400
Subject: [PATCH 2/2] Stop limiting `json-schema` version

This was causing conflicts in applications using `json-schema` 5.x.

The only breaking change in 5.0 was dropping support for old Ruby
versions, which we don't support either.
---
 mcp.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcp.gemspec b/mcp.gemspec
index ccbb63e7..fefe3b3c 100644
--- a/mcp.gemspec
+++ b/mcp.gemspec
@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency("json_rpc_handler", "~> 0.1")
-  spec.add_dependency("json-schema", "~> 4.1")
+  spec.add_dependency("json-schema", ">= 4.1")
 end