From a1fddcfe5527bb253086c21ea0a3146e5624acc9 Mon Sep 17 00:00:00 2001
From: Mark VanderVoord <mvandervoord@gmail.com>
Date: Fri, 18 Jun 2021 14:47:43 -0400
Subject: [PATCH 1/2] Grab latest dependencies. Support newer rake. Bump
 Version.

---
 ceedling.gemspec        | 2 +-
 lib/ceedling/version.rb | 2 +-
 vendor/cmock            | 2 +-
 vendor/unity            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ceedling.gemspec b/ceedling.gemspec
index e4c59425..a929b488 100644
--- a/ceedling.gemspec
+++ b/ceedling.gemspec
@@ -31,7 +31,7 @@ Ceedling projects are created with a YAML configuration file. A variety of conve
   s.required_ruby_version = ">= 2.4.0"
   
   s.add_dependency "thor", "~> 0.14"
-  s.add_dependency "rake", "~> 12"
+  s.add_dependency "rake", ">= 12", "< 14"
   s.add_dependency "deep_merge", "~> 1.2"
   s.add_dependency "constructor", "~> 2"
 
diff --git a/lib/ceedling/version.rb b/lib/ceedling/version.rb
index 8a16d50d..ebda10b7 100644
--- a/lib/ceedling/version.rb
+++ b/lib/ceedling/version.rb
@@ -48,7 +48,7 @@ module Version
       eval("#{name} = '#{a.join(".")}'")
     end
 
-    GEM = "0.31.0"
+    GEM = "0.31.1"
     CEEDLING = GEM
   end
 end
diff --git a/vendor/cmock b/vendor/cmock
index 9d092898..3d4ba8d2 160000
--- a/vendor/cmock
+++ b/vendor/cmock
@@ -1 +1 @@
-Subproject commit 9d092898ef26ece140d9225e037274b64d4f851e
+Subproject commit 3d4ba8d20b8958da5dace7dd5d31155c94b60819
diff --git a/vendor/unity b/vendor/unity
index 0b899aec..2f740657 160000
--- a/vendor/unity
+++ b/vendor/unity
@@ -1 +1 @@
-Subproject commit 0b899aec14d3a9abb2bf260ac355f0f28630a6a3
+Subproject commit 2f7406572e6f11212536c99a839e1bf512fe3fb6

From c77828b65b2ddffe0a8e626401f1dcecc2485dfa Mon Sep 17 00:00:00 2001
From: Mark VanderVoord <mvandervoord@gmail.com>
Date: Fri, 18 Jun 2021 15:22:25 -0400
Subject: [PATCH 2/2] Be a bit more flexible with which gcovr version we're
 testing. Be stricter about when to use the newer version (as it will fall
 back to the older version in some cases)

---
 plugins/gcov/lib/gcovr_reportinator.rb | 2 +-
 spec/gcov/gcov_deployment_spec.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gcov/lib/gcovr_reportinator.rb b/plugins/gcov/lib/gcovr_reportinator.rb
index fd61a8ba..5317c5d2 100644
--- a/plugins/gcov/lib/gcovr_reportinator.rb
+++ b/plugins/gcov/lib/gcovr_reportinator.rb
@@ -16,7 +16,7 @@ def make_reports(opts)
     # Build the common gcovr arguments.
     args_common = args_builder_common(opts)
 
-    if (gcovr_version_info[0] >= 4) && (gcovr_version_info[1] >= 2)
+    if ((gcovr_version_info[0] == 4) && (gcovr_version_info[1] >= 2)) || (gcovr_version_info[0] > 4)
       # gcovr version 4.2 and later supports generating multiple reports with a single call.
       args = args_common
       args += args_builder_cobertura(opts, false)
diff --git a/spec/gcov/gcov_deployment_spec.rb b/spec/gcov/gcov_deployment_spec.rb
index edf71af2..44cecda2 100644
--- a/spec/gcov/gcov_deployment_spec.rb
+++ b/spec/gcov/gcov_deployment_spec.rb
@@ -61,7 +61,7 @@
 
               @output = `bundle exec ruby -S ceedling utils:gcov`
               expect(@output).to match(/For now, creating only an HtmlBasic report\./)
-              expect(@output).to match(/Creating gcov results report\(s\) in 'build\/artifacts\/gcov'\.\.\. Done/)
+              expect(@output).to match(/Creating (?:a )?gcov (?:results)?(?:HTML)? report(?:\(s\))? in 'build\/artifacts\/gcov'\.\.\. Done/)
               expect(File.exists?('build/artifacts/gcov/GcovCoverageResults.html')).to eq true
 
             end