From 5e1e5af2e737bdc5537b4d2025d2ae8e57df3cdb Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 25 Jan 2023 16:45:19 +0900
Subject: [PATCH] Support simplecov-0.22.0.

  simplecov-0.22.0 no longer support pre-0.18 result format. result data needs
  `lines` key for coverage data.
---
 common.mk             | 2 +-
 tool/test-coverage.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index ead0354d02..abd652fe44 100644
--- a/common.mk
+++ b/common.mk
@@ -1374,7 +1374,7 @@ update-config_files: PHONY
 
 update-coverage: main PHONY
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "simplecov" -v "0.20.0"
+		--install-dir .bundle --conservative "simplecov"
 
 refresh-gems: update-bundled_gems prepare-gems
 prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
diff --git a/tool/test-coverage.rb b/tool/test-coverage.rb
index c4ffa66a4f..8913d8d435 100644
--- a/tool/test-coverage.rb
+++ b/tool/test-coverage.rb
@@ -78,7 +78,7 @@ def invoke_simplecov_formatter
   res.each do |path, cov|
     next unless path.start_with?(base_dir) || path.start_with?(cur_dir)
     next if path.start_with?(File.join(base_dir, "test"))
-    simplecov_result[path] = cov[:lines]
+    simplecov_result[path] = cov
   end
 
   a, b = base_dir, cur_dir