From b7d4957e31ea6d7291b03e5ab228f359c5843340 Mon Sep 17 00:00:00 2001
From: Daniel Azuma <dazuma@google.com>
Date: Wed, 17 Jul 2024 12:18:02 -0700
Subject: [PATCH] feat(common): Support for protobuf 4.x (#1085)

---
 .github/workflows/ci-common.yml   | 10 +++++-----
 gapic-common/Gemfile              | 15 +++++++--------
 gapic-common/gapic-common.gemspec | 12 ++++++------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-common.yml b/.github/workflows/ci-common.yml
index fdef631e7..05aee1444 100644
--- a/.github/workflows/ci-common.yml
+++ b/.github/workflows/ci-common.yml
@@ -17,9 +17,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            ruby: "2.7"
-            task: test
           - os: ubuntu-latest
             ruby: "3.0"
             task: test
@@ -28,12 +25,15 @@ jobs:
             task: test
           - os: ubuntu-latest
             ruby: "3.2"
+            task: test
+          - os: ubuntu-latest
+            ruby: "3.3"
             task: ci
           - os: macos-latest
-            ruby: "3.2"
+            ruby: "3.3"
             task: test
           - os: windows-latest
-            ruby: "3.2"
+            ruby: "3.3"
             task: test
       fail-fast: false
     runs-on: ${{ matrix.os }}
diff --git a/gapic-common/Gemfile b/gapic-common/Gemfile
index 2510dfa5d..48e0ba127 100644
--- a/gapic-common/Gemfile
+++ b/gapic-common/Gemfile
@@ -1,16 +1,15 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in gapic-common.gemspec
 gemspec
 
-gem "concurrent-ruby", "~> 1.2.2"
-gem "google-cloud-core", "~> 1.5"
-gem "google-style", "~> 1.27.0"
-gem "grpc-tools", "~> 1.60.0"
-gem "minitest", "~> 5.16"
+gem "concurrent-ruby", "~> 1.3"
+gem "google-cloud-core", "~> 1.7"
+gem "google-style", "~> 1.30.0"
+gem "grpc-tools", "~> 1.65"
+gem "minitest", "~> 5.24"
 gem "minitest-autotest", "~> 1.0"
-gem "minitest-focus", "~> 1.1"
-gem "minitest-rg", "~> 5.2"
+gem "minitest-focus", "~> 1.4"
+gem "minitest-rg", "~> 5.3"
 gem "pry", ">= 0.14"
 gem "redcarpet", "~> 3.0"
 gem "yard", "~> 0.9"
diff --git a/gapic-common/gapic-common.gemspec b/gapic-common/gapic-common.gemspec
index 5a3abfb49..c6d16430c 100644
--- a/gapic-common/gapic-common.gemspec
+++ b/gapic-common/gapic-common.gemspec
@@ -33,13 +33,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.platform =      Gem::Platform::RUBY
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.add_dependency "faraday", ">= 1.9", "< 3.a"
   spec.add_dependency "faraday-retry", ">= 1.0", "< 3.a"
-  spec.add_dependency "googleapis-common-protos", ">= 1.4.0", "< 2.a"
-  spec.add_dependency "googleapis-common-protos-types", ">= 1.11.0", "< 2.a"
-  spec.add_dependency "googleauth", "~> 1.9"
-  spec.add_dependency "google-protobuf", "~> 3.18"
-  spec.add_dependency "grpc", "~> 1.59"
+  spec.add_dependency "googleapis-common-protos", "~> 1.6"
+  spec.add_dependency "googleapis-common-protos-types", "~> 1.15"
+  spec.add_dependency "googleauth", "~> 1.11"
+  spec.add_dependency "google-protobuf", ">= 3.25", "< 5.a"
+  spec.add_dependency "grpc", "~> 1.65"
 end