From fd46f9366c8c507f4a4be239026deb3acdbfe098 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Fri, 25 Aug 2023 20:53:48 +0000
Subject: [PATCH 01/14] Update sbt-typelevel-mergify to 0.5.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8edcd0eab..45b9c3e97 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From 1eb3fd2e25c6323d06e17c7d5364fd8b9bcadef9 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Fri, 25 Aug 2023 20:55:04 +0000
Subject: [PATCH 02/14] Regenerate GitHub Actions workflow

Executed command: sbt githubWorkflowGenerate
---
 .github/workflows/ci.yml | 82 ++++++++++++++--------------------------
 .mergify.yml             |  6 +--
 2 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31a491fa0..b8d7cab88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,48 +17,39 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -104,60 +95,45 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.12.18)
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Download target directories (2.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
 
-      - name: Inflate target directories (2.12.18)
+      - name: Inflate target directories (2.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11)
+      - name: Download target directories (2.13)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index ca62fe7fd..10de4bc7c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs

From 534dc16740ee50fc3566c04f6d832d67f8908f30 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Sun, 27 Aug 2023 16:10:09 +0000
Subject: [PATCH 03/14] Revert commit(s) 1eb3fd2e, fd46f936

---
 .github/workflows/ci.yml | 82 ++++++++++++++++++++++++++--------------
 .mergify.yml             |  6 +--
 project/plugins.sbt      |  2 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8d7cab88..31a491fa0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,39 +17,48 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-concurrency:
-  group: ${{ github.workflow }} @ ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12, 2.13, 3]
+        scala: [2.12.18, 2.13.11, 3.3.0]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: typelevel/download-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
       - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 8
-          cache: sbt
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -95,45 +104,60 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: typelevel/download-java@v2
         with:
           distribution: temurin
           java-version: 8
-          cache: sbt
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: jdkfile
+          java-version: 8
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: Download target directories (2.12)
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
 
-      - name: Inflate target directories (2.12)
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13)
+      - name: Download target directories (2.13.11)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
 
-      - name: Inflate target directories (2.13)
+      - name: Inflate target directories (2.13.11)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3)
+      - name: Download target directories (3.3.0)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
 
-      - name: Inflate target directories (3)
+      - name: Inflate target directories (3.3.0)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index 10de4bc7c..ca62fe7fd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 45b9c3e97..8edcd0eab 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From 247e9a98d757ac6ea27b43c6c2d2ba12c7826cb5 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Sun, 27 Aug 2023 16:10:14 +0000
Subject: [PATCH 04/14] Update sbt-typelevel-mergify to 0.5.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8edcd0eab..45b9c3e97 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From a0488b67e87fd438081264475817a5edf442fd15 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Sun, 27 Aug 2023 16:11:25 +0000
Subject: [PATCH 05/14] Regenerate GitHub Actions workflow

Executed command: sbt githubWorkflowGenerate
---
 .github/workflows/ci.yml | 82 ++++++++++++++--------------------------
 .mergify.yml             |  6 +--
 2 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31a491fa0..b8d7cab88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,48 +17,39 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -104,60 +95,45 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.12.18)
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Download target directories (2.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
 
-      - name: Inflate target directories (2.12.18)
+      - name: Inflate target directories (2.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11)
+      - name: Download target directories (2.13)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index ca62fe7fd..10de4bc7c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs

From 6e96a1bacfb770524aafbb188a1039e9ed607a93 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Wed, 6 Sep 2023 21:20:48 +0000
Subject: [PATCH 06/14] Revert commit(s) a0488b67, 247e9a98

---
 .github/workflows/ci.yml | 82 ++++++++++++++++++++++++++--------------
 .mergify.yml             |  6 +--
 project/plugins.sbt      |  2 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8d7cab88..31a491fa0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,39 +17,48 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-concurrency:
-  group: ${{ github.workflow }} @ ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12, 2.13, 3]
+        scala: [2.12.18, 2.13.11, 3.3.0]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: typelevel/download-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
       - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 8
-          cache: sbt
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -95,45 +104,60 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: typelevel/download-java@v2
         with:
           distribution: temurin
           java-version: 8
-          cache: sbt
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: jdkfile
+          java-version: 8
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: Download target directories (2.12)
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
 
-      - name: Inflate target directories (2.12)
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13)
+      - name: Download target directories (2.13.11)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
 
-      - name: Inflate target directories (2.13)
+      - name: Inflate target directories (2.13.11)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3)
+      - name: Download target directories (3.3.0)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
 
-      - name: Inflate target directories (3)
+      - name: Inflate target directories (3.3.0)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index 10de4bc7c..ca62fe7fd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 45b9c3e97..8edcd0eab 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From c41b49a69bcd47c0f58b99a62a390f30eee077ce Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Wed, 6 Sep 2023 21:20:53 +0000
Subject: [PATCH 07/14] Update sbt-typelevel-mergify to 0.5.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index fcf787451..ad0ec0812 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From a99d35eebf32f11df7da4eacc7cb130578d8a43c Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Wed, 6 Sep 2023 21:22:09 +0000
Subject: [PATCH 08/14] Regenerate GitHub Actions workflow

Executed command: sbt githubWorkflowGenerate
---
 .github/workflows/ci.yml | 82 ++++++++++++++--------------------------
 .mergify.yml             |  6 +--
 2 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31a491fa0..b8d7cab88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,48 +17,39 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -104,60 +95,45 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.12.18)
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Download target directories (2.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
 
-      - name: Inflate target directories (2.12.18)
+      - name: Inflate target directories (2.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11)
+      - name: Download target directories (2.13)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index ca62fe7fd..10de4bc7c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs

From a2ec52828176bd28c55a19a07f74d34af368fc44 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Fri, 8 Sep 2023 20:24:02 +0000
Subject: [PATCH 09/14] Revert commit(s) a99d35ee, c41b49a6

---
 .github/workflows/ci.yml | 82 ++++++++++++++++++++++++++--------------
 .mergify.yml             |  6 +--
 project/plugins.sbt      |  2 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8d7cab88..31a491fa0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,39 +17,48 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-concurrency:
-  group: ${{ github.workflow }} @ ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12, 2.13, 3]
+        scala: [2.12.18, 2.13.11, 3.3.0]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: typelevel/download-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
       - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 8
-          cache: sbt
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -95,45 +104,60 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: typelevel/download-java@v2
         with:
           distribution: temurin
           java-version: 8
-          cache: sbt
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: jdkfile
+          java-version: 8
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: Download target directories (2.12)
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
 
-      - name: Inflate target directories (2.12)
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13)
+      - name: Download target directories (2.13.11)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
 
-      - name: Inflate target directories (2.13)
+      - name: Inflate target directories (2.13.11)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3)
+      - name: Download target directories (3.3.0)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
 
-      - name: Inflate target directories (3)
+      - name: Inflate target directories (3.3.0)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index 10de4bc7c..ca62fe7fd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ad0ec0812..fcf787451 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From 337a0108313ec01d9dbdbe17817d9d9c174c5dda Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Fri, 8 Sep 2023 20:24:07 +0000
Subject: [PATCH 10/14] Update sbt-typelevel-mergify to 0.5.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index fcf787451..ad0ec0812 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From f2254ca386a8eb113d187f97e361f9e8d3987fc3 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Fri, 8 Sep 2023 20:25:00 +0000
Subject: [PATCH 11/14] Regenerate GitHub Actions workflow

Executed command: sbt githubWorkflowGenerate
---
 .github/workflows/ci.yml | 82 ++++++++++++++--------------------------
 .mergify.yml             |  6 +--
 2 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31a491fa0..b8d7cab88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,48 +17,39 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -104,60 +95,45 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.12.18)
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Download target directories (2.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
 
-      - name: Inflate target directories (2.12.18)
+      - name: Inflate target directories (2.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11)
+      - name: Download target directories (2.13)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index ca62fe7fd..10de4bc7c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs

From d8e663c4351d0bc967cd7fd4a244b4b756be3bc3 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Sun, 10 Sep 2023 16:05:25 +0000
Subject: [PATCH 12/14] Revert commit(s) f2254ca3, 337a0108

---
 .github/workflows/ci.yml | 82 ++++++++++++++++++++++++++--------------
 .mergify.yml             |  6 +--
 project/plugins.sbt      |  2 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8d7cab88..31a491fa0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,39 +17,48 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-concurrency:
-  group: ${{ github.workflow }} @ ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12, 2.13, 3]
+        scala: [2.12.18, 2.13.11, 3.3.0]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: typelevel/download-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
       - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 8
-          cache: sbt
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -95,45 +104,60 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        id: setup-java-temurin-8
+      - name: Download Java (temurin@8)
+        id: download-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: typelevel/download-java@v2
         with:
           distribution: temurin
           java-version: 8
-          cache: sbt
 
-      - name: sbt update
-        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt +update
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: jdkfile
+          java-version: 8
+          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
 
-      - name: Download target directories (2.12)
+      - name: Cache sbt
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
 
-      - name: Inflate target directories (2.12)
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13)
+      - name: Download target directories (2.13.11)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
 
-      - name: Inflate target directories (2.13)
+      - name: Inflate target directories (2.13.11)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3)
+      - name: Download target directories (3.3.0)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
 
-      - name: Inflate target directories (3)
+      - name: Inflate target directories (3.3.0)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index 10de4bc7c..ca62fe7fd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ad0ec0812..fcf787451 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From 18ae5d26f54868a52eec6722fb62baf91b28023b Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Sun, 10 Sep 2023 16:05:28 +0000
Subject: [PATCH 13/14] Update sbt-typelevel-mergify to 0.5.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index b7558813a..b66c9c1c2 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.0")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")

From 514628e4b152ac4d7e8cbfba5e1eded219715b5c Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Sun, 10 Sep 2023 16:06:18 +0000
Subject: [PATCH 14/14] Regenerate GitHub Actions workflow

Executed command: sbt githubWorkflowGenerate
---
 .github/workflows/ci.yml | 82 ++++++++++++++--------------------------
 .mergify.yml             |  6 +--
 2 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31a491fa0..b8d7cab88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,48 +17,39 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -104,60 +95,45 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.12.18)
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Download target directories (2.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
 
-      - name: Inflate target directories (2.12.18)
+      - name: Inflate target directories (2.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11)
+      - name: Download target directories (2.13)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.mergify.yml b/.mergify.yml
index ca62fe7fd..10de4bc7c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=scala-steward
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12.18, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@8)
-  - status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@8)
   actions:
     merge: {}
 - name: Label benchmark PRs