From 6422aca41686098b75233af7c22198f8a1ad965c Mon Sep 17 00:00:00 2001 From: Michael Karlesky Date: Thu, 28 Nov 2024 16:06:57 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20=20Updated=20/=20added=20Gem=20v?= =?UTF-8?q?ersions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shenanigans around unspecified versions in Gemfile and old versions in .gemspec were causing Github Action build failures --- Gemfile | 14 +++++++------- Gemfile.lock | 28 +++++++++++++++------------- ceedling.gemspec | 3 ++- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 887f9485..a9a7bbc6 100644 --- a/Gemfile +++ b/Gemfile @@ -8,15 +8,15 @@ source "http://rubygems.org/" gem "bundler", "~> 2.5" -gem "rake" gem "rspec", "~> 3.8" -gem "require_all" -gem "constructor" -gem "diy" +gem "rake", ">= 12", "< 14" gem "rr" -gem "thor" -gem "deep_merge" -gem "unicode-display_width" +gem "require_all" +gem "diy", "~> 1.1" +gem "constructor", "~> 2" +gem "thor", "~> 1.3" +gem "deep_merge", "~> 1.2" +gem "unicode-display_width", "~> 3.1" #these will be used if present, but ignored otherwise #gem "curses" diff --git a/Gemfile.lock b/Gemfile.lock index 5cb2894c..8133ca0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,22 +8,24 @@ GEM constructor (>= 1.0.0) rake (13.2.1) require_all (3.0.0) - rr (3.1.0) + rr (3.1.1) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.2) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - thor (1.3.1) - unicode-display_width (2.5.0) + thor (1.3.2) + unicode-display_width (3.1.2) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) PLATFORMS ruby @@ -34,15 +36,15 @@ PLATFORMS DEPENDENCIES bundler (~> 2.5) - constructor - deep_merge - diy - rake + constructor (~> 2) + deep_merge (~> 1.2) + diy (~> 1.1) + rake (>= 12, < 14) require_all rr rspec (~> 3.8) - thor - unicode-display_width + thor (~> 1.3) + unicode-display_width (~> 3.1) BUNDLED WITH - 2.5.10 + 2.5.23 diff --git a/ceedling.gemspec b/ceedling.gemspec index 3b4bc22f..d29342e9 100644 --- a/ceedling.gemspec +++ b/ceedling.gemspec @@ -42,8 +42,9 @@ Ceedling projects are created with a YAML configuration file. A variety of conve s.add_dependency "thor", "~> 1.3" s.add_dependency "rake", ">= 12", "< 14" s.add_dependency "deep_merge", "~> 1.2" + s.add_dependency "diy", "~> 1.1" s.add_dependency "constructor", "~> 2" - s.add_dependency "unicode-display_width", "~> 2.5" + s.add_dependency "unicode-display_width", "~> 3.1" # Files needed from submodules s.files = []