From 550d7016dd9212fb48f5fda0229ac14de321363e Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Tue, 28 Apr 2026 08:25:02 +0200
Subject: [PATCH 1/2] Reorganize gemspec and Gemfile

---
 .rubocop.yml       |  2 ++
 .rubocop_todo.yml  | 12 ------------
 Gemfile            | 12 +++++++++++-
 zammad_api.gemspec | 10 +---------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0c24cc6..0ae18f9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -17,6 +17,8 @@ AllCops:
     - 'bin/spring'
     - 'db/schema.rb'
     - 'examples/**/*'
+  # Match the Ruby version specified in the gemspec.
+  TargetRubyVersion: 3.0
 
 # Zammad StyleGuide
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4945fff..20ec1c6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,15 +1,3 @@
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-
-Gemspec/RequireMFA:
-  Enabled: false
-
-Gemspec/AddRuntimeDependency:
-  Enabled: false
-
-Gemspec/DevelopmentDependencies:
-  Enabled: false
-
 Naming/PredicateMethod:
   Enabled: false
 
diff --git a/Gemfile b/Gemfile
index e5b8cc1..c22b0b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,14 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in zammad_api.gemspec
+# runtime dependencies are defined in zammad_api.gemspec
 gemspec
+
+# development dependencies
+gem 'bundler', '>= 2.2.10'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-performance'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'webmock'
diff --git a/zammad_api.gemspec b/zammad_api.gemspec
index b04a37a..7b09454 100644
--- a/zammad_api.gemspec
+++ b/zammad_api.gemspec
@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Ruby wrapper for the Zammad API v1.0.'
   spec.homepage      = 'https://github.com/zammad/zammad-api-client-ruby'
   spec.licenses = ['AGPL-3.0-only', 'MIT']
+  spec.required_ruby_version = '>= 3.0' # Same as TargetRubyVersion in .rubocop.yml.
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -24,13 +25,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'faraday', '~> 2'
-
-  spec.add_development_dependency 'bundler', '>= 2.2.10'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'webmock'
 end

From d20665c0ed93b5d26567aaf2721b120705ca318e Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Tue, 28 Apr 2026 09:16:21 +0200
Subject: [PATCH 2/2] Add gems group

---
 Gemfile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index c22b0b8..2e171f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,13 @@ source 'https://rubygems.org'
 gemspec
 
 # development dependencies
-gem 'bundler', '>= 2.2.10'
-gem 'rake'
-gem 'rspec'
-gem 'rubocop'
-gem 'rubocop-performance'
-gem 'rubocop-rake'
-gem 'rubocop-rspec'
-gem 'webmock'
+group :development, :test do
+  gem 'bundler', '>= 2.2.10'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'rubocop-rake'
+  gem 'rubocop-rspec'
+  gem 'webmock'
+end