From 6bc5c62c21276b0ef5326cd27465f4d0a2b70dbc Mon Sep 17 00:00:00 2001
From: Tobias Egli <tobias.egli@garaio-rem.ch>
Date: Thu, 9 Apr 2026 09:05:27 +0200
Subject: [PATCH 1/3] Remove Guard and darwin-specific development dependencies

---
 Gemfile   |  7 -------
 Guardfile | 14 --------------
 2 files changed, 21 deletions(-)
 delete mode 100644 Guardfile

diff --git a/Gemfile b/Gemfile
index 5768aa24..426732b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,6 @@ gemspec
 
 group :development do
   gem "rake"
-  gem "guard", "~> 2.14", platform: :mri
-  gem "guard-rspec", "~> 4.7", platform: :mri
 
   gem "yard", "~> 0.9"
   gem 'kramdown', "> 0", platform: :jruby
@@ -27,8 +25,3 @@ group :development, :test do
   gem "rollbar"
   gem "bugsnag"
 end
-
-group :development, :darwin do
-  gem "rb-fsevent", "~> 0.11.2"
-  gem "growl", "~> 1.0.3"
-end
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index f1aa05b4..00000000
--- a/Guardfile
+++ /dev/null
@@ -1,14 +0,0 @@
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-end

From fe0f59cd24c300c06acd8490cddcdea79e6a930a Mon Sep 17 00:00:00 2001
From: Tobias Egli <tobias.egli@garaio-rem.ch>
Date: Thu, 9 Apr 2026 09:10:14 +0200
Subject: [PATCH 2/3] Fix CHANGELOG Ruby version requirement (3.0, not 3.1)

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb865a1a..ca7ca83b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,10 +21,10 @@ Ruby's built-in `json` library directly.
 
 ## 1.4.0 (Apr 7, 2026)
 
-### Ruby 3.1 is Now Required
+### Ruby 3.0 is Now Required
 
 This version adopts [Bunny `3.x`](https://github.com/ruby-amqp/bunny/releases/tag/3.0.0)
-and as a result, requires Ruby 3.1.
+and as a result, requires Ruby 3.0.
 
 ### `without_namespace` Consumer DSL Option
 

From 3fc1b18802609f61942350357612f08de5da3913 Mon Sep 17 00:00:00 2001
From: Tobias Egli <tobias.egli@garaio-rem.ch>
Date: Thu, 9 Apr 2026 09:23:59 +0200
Subject: [PATCH 3/3] Modernize gemspec and YARD settings file paths

---
 hutch.gemspec                      | 6 +++---
 lib/yard-settings/yard-settings.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hutch.gemspec b/hutch.gemspec
index 171d5fb5..8fe0ee35 100644
--- a/hutch.gemspec
+++ b/hutch.gemspec
@@ -1,4 +1,4 @@
-require File.expand_path('../lib/hutch/version', __FILE__)
+require_relative 'lib/hutch/version'
 
 Gem::Specification.new do |gem|
   if defined?(JRUBY_VERSION)
@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.license = 'MIT'
   gem.executables = ['hutch']
-  gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- spec/*`.split("\n")
+  gem.files = Dir.glob('{lib,bin,templates}/**/*') + %w[README.md LICENSE CHANGELOG.md]
+  gem.test_files = Dir.glob('spec/**/*_spec.rb')
 end
diff --git a/lib/yard-settings/yard-settings.rb b/lib/yard-settings/yard-settings.rb
index f55cd0e9..8b052578 100644
--- a/lib/yard-settings/yard-settings.rb
+++ b/lib/yard-settings/yard-settings.rb
@@ -1,2 +1,2 @@
-YARD::Templates::Engine.register_template_path(File.dirname(__FILE__) + '/../../templates')
-require File.join(File.dirname(__FILE__), 'handler') if RUBY19
+YARD::Templates::Engine.register_template_path(File.join(__dir__, '../../templates'))
+require_relative 'handler'