From 880295421656b4f5a1e47360c82f781313c193ff Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 10 Jun 2026 23:15:35 +0900
Subject: [PATCH 1/4] feat: Allow puma v7 and v8

---
 .toys/ci.rb                 | 4 ++++
 functions_framework.gemspec | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.toys/ci.rb b/.toys/ci.rb
index c8c90cc2..e15d18f2 100644
--- a/.toys/ci.rb
+++ b/.toys/ci.rb
@@ -62,6 +62,10 @@ def run
     {puma: "5.0", rack: "2.1"},
     {puma: "6.0", rack: "2.1"},
     {puma: "6.0", rack: "3.0"},
+    {puma: "7.0", rack: "2.1"},
+    {puma: "7.0", rack: "3.0"},
+    {puma: "8.0", rack: "2.1"},
+    {puma: "8.0", rack: "3.0"},
   ]
 
   include :exec, result_callback: :handle_result
diff --git a/functions_framework.gemspec b/functions_framework.gemspec
index 6ccd3d85..7c0686bd 100644
--- a/functions_framework.gemspec
+++ b/functions_framework.gemspec
@@ -46,7 +46,7 @@ version = ::FunctionsFramework::VERSION
 
   spec.required_ruby_version = ">= 3.1.0"
   spec.add_dependency "cloud_events", ">= 0.7.0", "< 2.a"
-  spec.add_dependency "puma", ">= 4.3.0", "< 7.a"
+  spec.add_dependency "puma", ">= 4.3.0", "< 9.a"
   spec.add_dependency "rack", ">= 2.1", "< 4.a"
 
   if spec.respond_to? :metadata

From 85c745f34e1642713c37f95c705b42b38c38a8b6 Mon Sep 17 00:00:00 2001
From: Daniel Lee <danielylee@google.com>
Date: Wed, 1 Jul 2026 22:19:26 +0000
Subject: [PATCH 2/4] ci: run dependency matrix tests in unit workflow

---
 .github/workflows/unit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index db1e9ed4..8cef7f75 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby: ['3.1', '3.2', '3.3', '3.4']
-        flags: ["--only --test-unit"]
+        flags: ["--only --test-unit", "--only --test-dependencies"]
         include:
           - os: ubuntu-latest
             ruby: jruby

From da6aa2ec9b883ba671741b62fd4f36afd57f8ca6 Mon Sep 17 00:00:00 2001
From: Daniel Lee <danielylee@google.com>
Date: Wed, 1 Jul 2026 22:25:06 +0000
Subject: [PATCH 3/4] ci: restore puma matrix for conformance tests

---
 .github/workflows/conformance.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index b1e69743..b78183e9 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -13,10 +13,14 @@ permissions: read-all
 
 jobs:
   conformance:
+    if: ${{ github.repository == 'GoogleCloudPlatform/functions-framework-ruby' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ruby: ['3.1', '3.2', '3.3', '3.4']
+        puma: ['~> 6.0', '~> 7.0', '~> 8.0']
+    env:
+      FF_DEPENDENCY_TEST_PUMA: ${{ matrix.puma }}
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0

From f2691104fb627db65bf35d752265166acc93cc6b Mon Sep 17 00:00:00 2001
From: Daniel Lee <danielylee@google.com>
Date: Wed, 1 Jul 2026 22:36:56 +0000
Subject: [PATCH 4/4] ci: remove accidental if condition

---
 .github/workflows/conformance.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index b78183e9..7f083e51 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -13,7 +13,6 @@ permissions: read-all
 
 jobs:
   conformance:
-    if: ${{ github.repository == 'GoogleCloudPlatform/functions-framework-ruby' }}
     runs-on: ubuntu-latest
     strategy:
       matrix: