From 963df6f04ec4b4ed5e127f41e6aa9a2d8086aed3 Mon Sep 17 00:00:00 2001
From: "Peter H. Boling" <peter.boling@gmail.com>
Date: Mon, 14 Jul 2025 19:21:11 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=91=B7=20workflow=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/coverage.yml |  1 +
 .github/workflows/current.yml  | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index e54ed48c..44b211c5 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -94,6 +94,7 @@ jobs:
       # Build will fail here if coverage upload fails
       #   which will hopefully be noticed for the lack of code coverage comments
       - name: Upload coverage to CodeCov
+        if: ${{ !env.ACT }}
         uses: codecov/codecov-action@v5
         with:
           use_oidc: true
diff --git a/.github/workflows/current.yml b/.github/workflows/current.yml
index a4fb64e6..38bb53f2 100644
--- a/.github/workflows/current.yml
+++ b/.github/workflows/current.yml
@@ -37,15 +37,15 @@ jobs:
     strategy:
       matrix:
         include:
-          # Ruby 3.4
-          - ruby: "3.4"
+          # Ruby <whichever version is current, e.g., 3.4 as of 2025-07-12>
+          - ruby: "ruby"
             appraisal_name: "r3"
             exec_cmd: "rake test"
             gemfile: "Appraisal.root"
             rubygems: latest
             bundler: latest
 
-          # truffleruby-24.1
+          # truffleruby <whichever version is current, e.g., 24.1 as of 2025-07-12>
           - ruby: "truffleruby"
             appraisal_name: "r3"
             exec_cmd: "rake test"
@@ -53,7 +53,7 @@ jobs:
             rubygems: default
             bundler: default
 
-          # jruby-10.0 (targets Ruby 3.4 compatibility)
+          # jruby <whichever version is current, e.g., 10.0 (targets Ruby 3.4 compatibility) as of 2025-07-12>
           - ruby: "jruby"
             appraisal_name: "r3"
             exec_cmd: "rake test"
@@ -75,7 +75,7 @@ jobs:
           bundler: ${{ matrix.bundler }}
           bundler-cache: false
 
-      # Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
+      # Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e., Appraisal.root)
       # We need to do this first to get appraisal installed.
       # NOTE: This does not use the main Gemfile at all.
       - name: Install Root Appraisal

From 54d42c5e0146906378f38f029496bc8af410bdee Mon Sep 17 00:00:00 2001
From: "Peter H. Boling" <peter.boling@gmail.com>
Date: Mon, 14 Jul 2025 20:28:22 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=91=B7=20Removed=20HTML=20coverage=20?=
 =?UTF-8?q?output?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- https://github.com/codecov/feedback/discussions/726#discussioncomment-13756707
---
 .github/workflows/coverage.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 44b211c5..a91a75cd 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -9,7 +9,8 @@ env:
   K_SOUP_COV_MIN_BRANCH: 85
   K_SOUP_COV_MIN_LINE: 91
   K_SOUP_COV_MIN_HARD: true
-  K_SOUP_COV_FORMATTERS: "html,xml,rcov,lcov,json,tty"
+  # Removed HTML output, see: https://github.com/codecov/feedback/discussions/726#discussioncomment-13756707
+  K_SOUP_COV_FORMATTERS: "xml,rcov,lcov,json,tty"
   K_SOUP_COV_DO: true
   K_SOUP_COV_MULTI_FORMATTERS: true
   K_SOUP_COV_COMMAND_NAME: "Test Coverage"

From 33796b32f1a025672e42488b897097a67cbbd7f5 Mon Sep 17 00:00:00 2001
From: "Peter H. Boling" <peter.boling@gmail.com>
Date: Mon, 14 Jul 2025 20:40:21 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Switch=20to=20appraisa?=
 =?UTF-8?q?l2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/coverage.yml    |  1 +
 .idea/workspace.xml               | 12 ++++++------
 Appraisal.root.gemfile            |  2 +-
 Gemfile                           |  2 +-
 Gemfile.lock                      | 23 ++++++++---------------
 gemfiles/modular/coverage.gemfile |  3 ---
 6 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index a91a75cd..babbd91d 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -6,6 +6,7 @@ permissions:
   id-token: write
 
 env:
+  COVERAGE: true
   K_SOUP_COV_MIN_BRANCH: 85
   K_SOUP_COV_MIN_LINE: 91
   K_SOUP_COV_MIN_HARD: true
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd5145b2..f3927d0d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="93d48b1a-c179-44bf-b84b-ec878661df4e" name="Changes" comment="➕ cgi dependency for GHA">
+      <change beforePath="$PROJECT_DIR$/.github/workflows/coverage.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/coverage.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Appraisal.root.gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/Appraisal.root.gemfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/r3/libs.gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/r3/libs.gemfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/r3/set-1.gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/r3/set-1.gemfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/r3/set-2.gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/r3/set-2.gemfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/vHEAD.gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/gemfiles/modular/x_std_libs/vHEAD.gemfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gemfiles/modular/coverage.gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/gemfiles/modular/coverage.gemfile" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -47,7 +47,7 @@
                 <list>
                   <RecentBranch>
                     <option name="branchName" value="next" />
-                    <option name="lastUsedInstant" value="1751482378" />
+                    <option name="lastUsedInstant" value="1752524936" />
                   </RecentBranch>
                   <RecentBranch>
                     <option name="branchName" value="main" />
@@ -88,7 +88,7 @@
     "com.github.patou.gitmoji.text-after-unicode": " ",
     "com.github.patou.gitmoji.use-unicode": "true",
     "com.intellij.lang.ruby.rbs.tools.collection.workspace.sync.RbsCollectionUpdateProjectActivity#LAST_UPDATE_TIMESTAMP": "1751922175320",
-    "git-widget-placeholder": "#59 on next",
+    "git-widget-placeholder": "next",
     "junie.onboarding.icon.badge.shown": "true",
     "last_opened_file_path": "/home/pboling/src/ruby-openid/ruby-openid2/gemfiles/modular/cgi/r3",
     "node.js.detected.package.eslint": "true",
diff --git a/Appraisal.root.gemfile b/Appraisal.root.gemfile
index 4a77eb1f..7caed675 100755
--- a/Appraisal.root.gemfile
+++ b/Appraisal.root.gemfile
@@ -14,4 +14,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
+gem "appraisal2", github: "appraisal-rb/appraisal2", branch: "main"
diff --git a/Gemfile b/Gemfile
index df465c9a..191fb635 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gemspec
 eval_gemfile "gemfiles/modular/debug.gemfile"
 
 ### Testing
-gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
+gem "appraisal2", github: "appraisal-rb/appraisal2", branch: "main"
 
 # Only runs on the latest Ruby
 if current_ruby_version >= latest_ruby_version
diff --git a/Gemfile.lock b/Gemfile.lock
index 24e61197..5b0ccfd3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,9 @@
 GIT
-  remote: https://github.com/dashingrocket/simplecov-cobertura
-  revision: b72eacdeab8b055533debc6fd150cb977db0ca3e
+  remote: https://github.com/appraisal-rb/appraisal2
+  revision: 499a56ddcd75b413ed4b536ab8c0b6db47afa907
   branch: main
   specs:
-    simplecov-cobertura (2.1.1.pre.dev)
-      rexml
-      simplecov (~> 0.19)
-
-GIT
-  remote: https://github.com/pboling/appraisal
-  revision: a3a3e4b7db67d9b085f96b2ffddd2b51bd8a1196
-  branch: galtzo
-  specs:
-    appraisal (3.0.0.rc1)
+    appraisal2 (3.0.0)
       bundler (>= 1.17.3)
       rake (>= 10)
       thor (>= 0.14)
@@ -127,7 +118,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    rdoc (6.14.1)
+    rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
     reek (6.5.0)
@@ -202,6 +193,9 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
     simplecov-console (0.9.3)
       ansi
       simplecov
@@ -250,7 +244,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  appraisal!
+  appraisal2!
   benchmark (~> 0.4)
   bundler-audit (~> 0.9.2)
   cgi (~> 0.5.0)
@@ -272,7 +266,6 @@ DEPENDENCIES
   rubocop-minitest (~> 0.36)
   rubocop-packaging (~> 0.6, >= 0.6.0)
   ruby-openid2!
-  simplecov-cobertura!
   standard (~> 1.47)
   stone_checksums (~> 1.0)
   uri (~> 1.0, >= 1.0.3)
diff --git a/gemfiles/modular/coverage.gemfile b/gemfiles/modular/coverage.gemfile
index 0ae31256..72efc553 100644
--- a/gemfiles/modular/coverage.gemfile
+++ b/gemfiles/modular/coverage.gemfile
@@ -4,6 +4,3 @@
 
 # Coverage
 # All coverage gems are listed in gemspec dependencies.
-# But fix in the main branch (https://github.com/dashingrocket/simplecov-cobertura/pull/32)
-#   needed to prevent the circular require warning and stacktrace.
-gem "simplecov-cobertura", github: "dashingrocket/simplecov-cobertura", branch: "main"