From 2d9f7b35fb3a0bf60ace79db802c91187f52bdf5 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 27 Mar 2024 14:40:28 +0000
Subject: [PATCH] (CAT-1754) Remove duplicate gems

Duplicate gems within the Gemfile our causing issue with the PDK, this aims to resolve this by removing the duplicates and instead creating a joint `:development, :release_prep` group for the gems that overlap between them, rather than having them repeated in both groups seperately.
---
 config_defaults.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/config_defaults.yml b/config_defaults.yml
index 9552430..1a7f162 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -515,8 +515,6 @@ Gemfile:
         version: '~> 1.18'
       - gem: 'metadata-json-lint'
         version: '~> 4.0'
-      - gem: 'puppetlabs_spec_helper'
-        version: '~> 6.0'
       - gem: 'rspec-puppet-facts'
         version: '~> 2.0'
       - gem: 'dependency_checker'
@@ -535,14 +533,17 @@ Gemfile:
         version: '= 1.16.0'
       - gem: 'rubocop-rspec'
         version: '= 2.19.0'
-      - gem: 'puppet-strings'
-        version: '~> 4.0'
       - gem: 'rb-readline'
         version: '= 0.5.5'
         platforms:
           - mswin
           - mingw
           - x64_mingw
+    ':development, :release_prep':
+      - gem: 'puppet-strings'
+        version: '~> 4.0'
+      - gem: 'puppetlabs_spec_helper'
+        version: '~> 6.0'
     ':system_tests':
       - gem: 'puppet_litmus'
         version: 
@@ -559,11 +560,6 @@ Gemfile:
           - x64_mingw
       - gem: 'serverspec'
         version: '~> 2.41'
-    ':release_prep':
-      - gem: 'puppet-strings'
-        version: '~> 4.0'
-      - gem: 'puppetlabs_spec_helper'
-        version: '~> 6.0'
 spec/default_facts.yml:
   is_pe: false
   networking:
-- 
GitLab