From a01aa8849cbcf2392dc978698cda32d3ff86efaa Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 20 Jul 2023 16:05:54 +1000
Subject: [PATCH 1/2] Add Ruby version to engines for Rubocop

> This ensures that RuboCop is using the same Ruby version as the gem.

https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Gemspec/RequiredRubyVersion
---
 .rubocop_todo.yml                                 | 10 ----------
 engines/catalog/catalog.gemspec                   |  2 ++
 engines/dfc_provider/dfc_provider.gemspec         |  2 ++
 engines/order_management/order_management.gemspec |  2 ++
 engines/web/web.gemspec                           |  2 ++
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index dd41add2d0..bd7e8d2bdd 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,16 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'engines/catalog/catalog.gemspec'
-    - 'engines/dfc_provider/dfc_provider.gemspec'
-    - 'engines/order_management/order_management.gemspec'
-    - 'engines/web/web.gemspec'
-
 # Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
diff --git a/engines/catalog/catalog.gemspec b/engines/catalog/catalog.gemspec
index 2354adf5eb..8256f05685 100644
--- a/engines/catalog/catalog.gemspec
+++ b/engines/catalog/catalog.gemspec
@@ -10,6 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ["developers@ofn"]
   s.summary     = "Catalog domain of the OFN solution."
 
+  s.required_ruby_version = File.read(File.expand_path("../../.ruby-version", __dir__)).chomp
+
   s.files = Dir["{app,config,db,lib}/**/*"] + ["LICENSE.txt", "Rakefile", "README.rdoc"]
   s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/engines/dfc_provider/dfc_provider.gemspec b/engines/dfc_provider/dfc_provider.gemspec
index 423ec96753..0ff3917103 100644
--- a/engines/dfc_provider/dfc_provider.gemspec
+++ b/engines/dfc_provider/dfc_provider.gemspec
@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.summary     = 'Provides an API stack implementing DFC semantic ' \
                      'specifications'
 
+  spec.required_ruby_version = File.read(File.expand_path("../../.ruby-version", __dir__)).chomp
+
   spec.files = Dir["{app,config,lib}/**/*"] + ['README.md']
 
   spec.add_dependency 'active_model_serializers', '~> 0.8.4'
diff --git a/engines/order_management/order_management.gemspec b/engines/order_management/order_management.gemspec
index 6adda89bd7..6a978ecc35 100644
--- a/engines/order_management/order_management.gemspec
+++ b/engines/order_management/order_management.gemspec
@@ -10,6 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ["developers@ofn"]
   s.summary     = "Order Management domain of the OFN solution."
 
+  s.required_ruby_version = File.read(File.expand_path("../../.ruby-version", __dir__)).chomp
+
   s.files = Dir["{app,config,db,lib}/**/*"] + ["LICENSE.txt", "Rakefile", "README.rdoc"]
   s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/engines/web/web.gemspec b/engines/web/web.gemspec
index 070aa06648..086a224895 100644
--- a/engines/web/web.gemspec
+++ b/engines/web/web.gemspec
@@ -10,6 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ["developers@ofn"]
   s.summary     = "Web domain of the OFN solution."
 
+  s.required_ruby_version = File.read(File.expand_path("../../.ruby-version", __dir__)).chomp
+
   s.files = Dir["{app,config,db,lib}/**/*"] + ["LICENSE.txt", "Rakefile", "README.rdoc"]
   s.metadata['rubygems_mfa_required'] = 'true'
 end

From 54f39668ba2706858b1baf15ff101b21e523a57a Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 20 Jul 2023 16:11:16 +1000
Subject: [PATCH 2/2] Remove unused, outdated dependency declarations

The Gemfile of the main app is used.
---
 Gemfile.lock                              | 3 ---
 engines/dfc_provider/dfc_provider.gemspec | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 670fbcf113..9acc159445 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,9 +26,6 @@ PATH
   remote: engines/dfc_provider
   specs:
     dfc_provider (0.0.1)
-      active_model_serializers (~> 0.8.4)
-      jwt (~> 2.2)
-      rspec (~> 3.9)
 
 PATH
   remote: engines/order_management
diff --git a/engines/dfc_provider/dfc_provider.gemspec b/engines/dfc_provider/dfc_provider.gemspec
index 0ff3917103..26be88b4f9 100644
--- a/engines/dfc_provider/dfc_provider.gemspec
+++ b/engines/dfc_provider/dfc_provider.gemspec
@@ -17,8 +17,5 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{app,config,lib}/**/*"] + ['README.md']
 
-  spec.add_dependency 'active_model_serializers', '~> 0.8.4'
-  spec.add_dependency 'jwt', '~> 2.2'
-  spec.add_dependency 'rspec', '~> 3.9'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end