From d1a5ea0a8793e6032b8f59ffa3c5e2ff0bf99365 Mon Sep 17 00:00:00 2001
From: Daniel Azuma <dazuma@google.com>
Date: Tue, 5 Mar 2024 19:59:10 +0000
Subject: [PATCH] feat(multi): Update minimum supported Ruby version to 2.7

---
 google-cloud-bigquery/.rubocop.yml              |  4 ++++
 google-cloud-bigquery/Gemfile                   | 12 +++++++++++-
 .../google-cloud-bigquery.gemspec               | 14 +-------------
 .../lib/google-cloud-bigquery.rb                |  6 ++++--
 .../lib/google/cloud/bigquery.rb                |  2 +-
 .../lib/google/cloud/bigquery/project.rb        |  3 ++-
 .../lib/google/cloud/bigquery/service.rb        |  6 ++++--
 google-cloud-bigtable/Gemfile                   |  9 ++++++++-
 .../google-cloud-bigtable.gemspec               | 11 +----------
 .../lib/google-cloud-bigtable.rb                |  6 ++++--
 .../google/cloud/bigtable/chunk_processor.rb    | 10 +++++-----
 .../google/cloud/bigtable/column_family_map.rb  |  9 +++------
 .../lib/google/cloud/bigtable/service.rb        | 12 +++++-------
 google-cloud-core/Gemfile                       | 12 +++++++++++-
 google-cloud-core/Rakefile                      |  1 -
 google-cloud-core/google-cloud-core.gemspec     | 13 +------------
 google-cloud-core/lib/google/cloud/config.rb    | 12 ++++--------
 google-cloud-datastore/Gemfile                  | 11 ++++++++++-
 .../google-cloud-datastore.gemspec              | 13 +------------
 .../lib/google-cloud-datastore.rb               |  7 +++++--
 .../lib/google/cloud/datastore.rb               |  2 +-
 .../dataset/aggregate_query_results.rb          |  3 +--
 .../lib/google/cloud/datastore/gql_query.rb     |  7 +++----
 .../lib/google/cloud/datastore/key.rb           |  2 +-
 .../lib/google/cloud/datastore/properties.rb    |  5 +++--
 .../lib/google/cloud/datastore/service.rb       |  5 ++---
 google-cloud-dns/Gemfile                        | 11 ++++++++++-
 google-cloud-dns/google-cloud-dns.gemspec       | 13 +------------
 google-cloud-dns/lib/google-cloud-dns.rb        |  6 ++++--
 google-cloud-dns/lib/google/cloud/dns.rb        |  2 +-
 .../lib/google/cloud/dns/service.rb             | 10 +++++-----
 google-cloud-error_reporting/Gemfile            | 14 ++++++++++++--
 .../google-cloud-error_reporting.gemspec        | 14 +-------------
 .../lib/google-cloud-error_reporting.rb         |  3 ++-
 .../lib/google/cloud/error_reporting.rb         |  2 +-
 .../google/cloud/error_reporting/middleware.rb  |  2 +-
 .../lib/google/cloud/error_reporting/rails.rb   |  4 ++--
 .../lib/google/cloud/error_reporting/service.rb |  2 +-
 google-cloud-errors/Gemfile                     | 11 ++++++++++-
 google-cloud-errors/Rakefile                    |  1 -
 google-cloud-errors/google-cloud-errors.gemspec | 13 +------------
 google-cloud-errors/lib/google/cloud/errors.rb  |  2 +-
 google-cloud-firestore/Gemfile                  | 12 ++++++++++--
 .../google-cloud-firestore.gemspec              | 13 +------------
 .../lib/google-cloud-firestore.rb               |  3 ++-
 .../lib/google/cloud/firestore.rb               |  4 ++--
 .../google/cloud/firestore/aggregate_query.rb   |  2 +-
 .../lib/google/cloud/firestore/convert.rb       | 10 +++++-----
 .../google/cloud/firestore/document_snapshot.rb |  2 +-
 google-cloud-logging/Gemfile                    | 15 +++++++++++++--
 .../google-cloud-logging.gemspec                | 15 +--------------
 .../lib/google/cloud/logging.rb                 |  4 ++--
 .../lib/google/cloud/logging/middleware.rb      |  2 +-
 .../lib/google/cloud/logging/service.rb         |  6 +++---
 google-cloud-pubsub/.rubocop.yml                |  3 +++
 google-cloud-pubsub/Gemfile                     | 17 +++++++++++++----
 google-cloud-pubsub/Rakefile                    |  1 -
 google-cloud-pubsub/google-cloud-pubsub.gemspec | 14 +-------------
 google-cloud-pubsub/lib/google/cloud/pubsub.rb  |  4 ++--
 .../lib/google/cloud/pubsub/convert.rb          |  2 +-
 .../lib/google/cloud/pubsub/flow_controller.rb  |  2 --
 .../lib/google/cloud/pubsub/message.rb          |  5 ++---
 .../lib/google/cloud/pubsub/service.rb          |  2 +-
 .../pubsub_publish_with_ordering_keys.rb        |  2 +-
 .../samples/pubsub_publisher_batch_settings.rb  |  2 +-
 .../pubsub_resume_publish_with_ordering_keys.rb |  6 +++---
 google-cloud-resource_manager/Gemfile           | 11 ++++++++++-
 .../google-cloud-resource_manager.gemspec       | 13 +------------
 .../lib/google-cloud-resource_manager.rb        |  6 ++++--
 .../google/cloud/resource_manager/service.rb    | 11 ++++-------
 google-cloud-trace/Gemfile                      | 16 ++++++++++++++--
 google-cloud-trace/google-cloud-trace.gemspec   | 16 +---------------
 google-cloud-trace/lib/google-cloud-trace.rb    |  3 ++-
 google-cloud-trace/lib/google/cloud/trace.rb    |  4 ++--
 google-cloud-translate-v2/Gemfile               |  9 +++++++++
 .../google-cloud-translate-v2.gemspec           | 12 +-----------
 stackdriver-core/Gemfile                        | 11 ++++++++++-
 stackdriver-core/Rakefile                       |  1 -
 .../lib/stackdriver/core/trace_context.rb       |  9 ++++-----
 stackdriver-core/stackdriver-core.gemspec       | 13 +------------
 stackdriver/Gemfile                             | 14 ++++++++++++--
 stackdriver/Rakefile                            |  1 -
 stackdriver/stackdriver.gemspec                 | 14 +-------------
 83 files changed, 295 insertions(+), 324 deletions(-)

diff --git a/google-cloud-bigquery/.rubocop.yml b/google-cloud-bigquery/.rubocop.yml
index 3c0cdb104a87..100d9cda47c9 100644
--- a/google-cloud-bigquery/.rubocop.yml
+++ b/google-cloud-bigquery/.rubocop.yml
@@ -36,3 +36,7 @@ Naming/FileName:
 Naming/MethodParameterName:
   Exclude:
     - "lib/google/cloud/bigquery/external/**/*.rb"
+Style/ReturnNilInPredicateMethodDefinition:
+  Exclude:
+    - "lib/google/cloud/bigquery/table.rb"
+    - "lib/google/cloud/bigquery/table/async_inserter.rb"
diff --git a/google-cloud-bigquery/Gemfile b/google-cloud-bigquery/Gemfile
index 78fe7f50b9ba..a0f7e478396c 100644
--- a/google-cloud-bigquery/Gemfile
+++ b/google-cloud-bigquery/Gemfile
@@ -2,9 +2,19 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
+gem "google-cloud-data_catalog", "~> 1.2"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 gem "google-cloud-storage", path: "../google-cloud-storage"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
 gem "minitest-reporters", "~> 1.5.0", require: false
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.18"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-bigquery/google-cloud-bigquery.gemspec b/google-cloud-bigquery/google-cloud-bigquery.gemspec
index d7774441ddc5..ff5d98b1c2cf 100644
--- a/google-cloud-bigquery/google-cloud-bigquery.gemspec
+++ b/google-cloud-bigquery/google-cloud-bigquery.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
                        "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "concurrent-ruby", "~> 1.0"
   gem.add_dependency "google-apis-bigquery_v2", "~> 0.62"
@@ -24,16 +24,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "googleauth", "~> 1.9"
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "mini_mime", "~> 1.0"
-
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "google-cloud-data_catalog", "~> 1.2"
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.18"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-bigquery/lib/google-cloud-bigquery.rb b/google-cloud-bigquery/lib/google-cloud-bigquery.rb
index d2c71cb934da..a4cce81a5d43 100644
--- a/google-cloud-bigquery/lib/google-cloud-bigquery.rb
+++ b/google-cloud-bigquery/lib/google-cloud-bigquery.rb
@@ -71,9 +71,11 @@ module Cloud
     #   bigquery = gcloud.bigquery scope: platform_scope
     #
     def bigquery scope: nil, retries: nil, timeout: nil
+      retries ||= @retries
+      timeout ||= @timeout
       Google::Cloud.bigquery @project, @keyfile, scope:   scope,
-                                                 retries: (retries || @retries),
-                                                 timeout: (timeout || @timeout)
+                                                 retries: retries,
+                                                 timeout: timeout
     end
 
     ##
diff --git a/google-cloud-bigquery/lib/google/cloud/bigquery.rb b/google-cloud-bigquery/lib/google/cloud/bigquery.rb
index 776dcb9dcb9a..48d213dd40a1 100644
--- a/google-cloud-bigquery/lib/google/cloud/bigquery.rb
+++ b/google-cloud-bigquery/lib/google/cloud/bigquery.rb
@@ -72,7 +72,7 @@ def self.new project_id: nil, credentials: nil, scope: nil, retries: nil, timeou
         retries     ||= configure.retries
         timeout     ||= configure.timeout
         endpoint    ||= configure.endpoint
-        credentials ||= (keyfile || default_credentials(scope: scope))
+        credentials ||= keyfile || default_credentials(scope: scope)
         universe_domain ||= configure.universe_domain
 
         unless credentials.is_a? Google::Auth::Credentials
diff --git a/google-cloud-bigquery/lib/google/cloud/bigquery/project.rb b/google-cloud-bigquery/lib/google/cloud/bigquery/project.rb
index fb525a3680f9..528106d83023 100644
--- a/google-cloud-bigquery/lib/google/cloud/bigquery/project.rb
+++ b/google-cloud-bigquery/lib/google/cloud/bigquery/project.rb
@@ -633,6 +633,7 @@ def query_job query,
                       create_session: nil,
                       session_id: nil
           ensure_service!
+          project ||= self.project
           options = {
             params: params,
             types: types,
@@ -644,7 +645,7 @@ def query_job query,
             write: write,
             dryrun: dryrun,
             dataset: dataset,
-            project: (project || self.project),
+            project: project,
             standard_sql: standard_sql,
             legacy_sql: legacy_sql,
             large_results: large_results,
diff --git a/google-cloud-bigquery/lib/google/cloud/bigquery/service.rb b/google-cloud-bigquery/lib/google/cloud/bigquery/service.rb
index ec16a60d91fb..2d991443589b 100644
--- a/google-cloud-bigquery/lib/google/cloud/bigquery/service.rb
+++ b/google-cloud-bigquery/lib/google/cloud/bigquery/service.rb
@@ -558,13 +558,15 @@ def job_ref_from job_id, prefix, location: nil
         def dataset_ref_from dts, pjt = nil
           return nil if dts.nil?
           if dts.respond_to? :dataset_id
+            pjt ||= dts.project_id || @project
             Google::Apis::BigqueryV2::DatasetReference.new(
-              project_id: (pjt || dts.project_id || @project),
+              project_id: pjt,
               dataset_id: dts.dataset_id
             )
           else
+            pjt ||= @project
             Google::Apis::BigqueryV2::DatasetReference.new(
-              project_id: (pjt || @project),
+              project_id: pjt,
               dataset_id: dts
             )
           end
diff --git a/google-cloud-bigtable/Gemfile b/google-cloud-bigtable/Gemfile
index 7a96a1dca08d..ec61fcf8d4e6 100644
--- a/google-cloud-bigtable/Gemfile
+++ b/google-cloud-bigtable/Gemfile
@@ -6,6 +6,13 @@ gem "google-cloud-bigtable-admin-v2", path: "../google-cloud-bigtable-admin-v2"
 gem "google-cloud-bigtable-v2", path: "../google-cloud-bigtable-v2"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-focus", "~> 1.1"
 gem "minitest-reporters", "~> 1.5.0", require: false
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-bigtable/google-cloud-bigtable.gemspec b/google-cloud-bigtable/google-cloud-bigtable.gemspec
index 15b64b4c0ea0..33b7a2bf9170 100644
--- a/google-cloud-bigtable/google-cloud-bigtable.gemspec
+++ b/google-cloud-bigtable/google-cloud-bigtable.gemspec
@@ -21,19 +21,10 @@ Gem::Specification.new do |gem|
                        "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "concurrent-ruby", "~> 1.0"
   gem.add_dependency "google-cloud-bigtable-admin-v2", "~> 0.0"
   gem.add_dependency "google-cloud-bigtable-v2", "~> 0.14"
   gem.add_dependency "google-cloud-core", "~> 1.5"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-bigtable/lib/google-cloud-bigtable.rb b/google-cloud-bigtable/lib/google-cloud-bigtable.rb
index dc782df5160e..0e38fac22aed 100644
--- a/google-cloud-bigtable/lib/google-cloud-bigtable.rb
+++ b/google-cloud-bigtable/lib/google-cloud-bigtable.rb
@@ -65,11 +65,13 @@ module Cloud
     #   bigtable = gcloud.bigtable
     #
     def bigtable scope: nil, timeout: nil, credentials: nil
+      credentials ||= @keyfile
+      timeout ||= @timeout
       Google::Cloud.bigtable(
         project_id:  @project,
-        credentials: (credentials || @keyfile),
+        credentials: credentials,
         scope:       scope,
-        timeout:     (timeout || @timeout)
+        timeout:     timeout
       )
     end
 
diff --git a/google-cloud-bigtable/lib/google/cloud/bigtable/chunk_processor.rb b/google-cloud-bigtable/lib/google/cloud/bigtable/chunk_processor.rb
index 2b07c0406987..6072f6ad2d2b 100644
--- a/google-cloud-bigtable/lib/google/cloud/bigtable/chunk_processor.rb
+++ b/google-cloud-bigtable/lib/google/cloud/bigtable/chunk_processor.rb
@@ -76,11 +76,11 @@ def process chunk
         def validate_reset_row
           return unless chunk.reset_row
 
-          value = (!chunk.row_key.empty? ||
-              chunk.family_name ||
-              chunk.qualifier ||
-              !chunk.value.empty? ||
-              chunk.timestamp_micros.positive?)
+          value = !chunk.row_key.empty? ||
+                  chunk.family_name ||
+                  chunk.qualifier ||
+                  !chunk.value.empty? ||
+                  chunk.timestamp_micros.positive?
 
           raise_if value, "A reset should have no data"
         end
diff --git a/google-cloud-bigtable/lib/google/cloud/bigtable/column_family_map.rb b/google-cloud-bigtable/lib/google/cloud/bigtable/column_family_map.rb
index 4debd2304ad4..428963002be5 100644
--- a/google-cloud-bigtable/lib/google/cloud/bigtable/column_family_map.rb
+++ b/google-cloud-bigtable/lib/google/cloud/bigtable/column_family_map.rb
@@ -370,8 +370,7 @@ def created_modifications comparison_map
           added_keys = @column_families.keys - comparison_map.keys
 
           added_keys.map do |name|
-            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest:: \
-            Modification.new(
+            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification.new(
               id:     name,
               create: @column_families[name]
             )
@@ -394,8 +393,7 @@ def updated_modifications comparison_map
           end
 
           updated_keys.map do |name|
-            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest:: \
-            Modification.new(
+            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification.new(
               id:     name,
               update: @column_families[name]
             )
@@ -415,8 +413,7 @@ def dropped_modifications comparison_map
           dropped_keys = comparison_map.keys - @column_families.keys
 
           dropped_keys.map do |name|
-            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest:: \
-            Modification.new(
+            Google::Cloud::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification.new(
               id:   name,
               drop: true
             )
diff --git a/google-cloud-bigtable/lib/google/cloud/bigtable/service.rb b/google-cloud-bigtable/lib/google/cloud/bigtable/service.rb
index a4fa1f50f97d..4608726d2cdd 100644
--- a/google-cloud-bigtable/lib/google/cloud/bigtable/service.rb
+++ b/google-cloud-bigtable/lib/google/cloud/bigtable/service.rb
@@ -658,13 +658,11 @@ def test_table_permissions instance_id, table_id, permissions
 
         def read_rows instance_id, table_id, app_profile_id: nil, rows: nil, filter: nil, rows_limit: nil
           client(table_path(instance_id, table_id), app_profile_id).read_rows(
-            **{
-              table_name:     table_path(instance_id, table_id),
-              rows:           rows,
-              filter:         filter,
-              rows_limit:     rows_limit,
-              app_profile_id: app_profile_id
-            }
+            table_name:     table_path(instance_id, table_id),
+            rows:           rows,
+            filter:         filter,
+            rows_limit:     rows_limit,
+            app_profile_id: app_profile_id
           )
         end
 
diff --git a/google-cloud-core/Gemfile b/google-cloud-core/Gemfile
index c377d2a9fc2d..a7f53dbcfd6a 100644
--- a/google-cloud-core/Gemfile
+++ b/google-cloud-core/Gemfile
@@ -2,7 +2,17 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "googleauth", "~> 1.0"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 
+gem "autotest-suffix", "~> 1.1"
+gem "googleauth", "~> 1.0"
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.14"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-core/Rakefile b/google-cloud-core/Rakefile
index ee7cf25c3c35..371b1deaf46d 100644
--- a/google-cloud-core/Rakefile
+++ b/google-cloud-core/Rakefile
@@ -80,7 +80,6 @@ desc "Start an interactive shell."
 task :console do
   require "irb"
   require "irb/completion"
-  require "pp"
 
   $LOAD_PATH.unshift "lib"
 
diff --git a/google-cloud-core/google-cloud-core.gemspec b/google-cloud-core/google-cloud-core.gemspec
index 28dad200a9a4..4e6194755316 100644
--- a/google-cloud-core/google-cloud-core.gemspec
+++ b/google-cloud-core/google-cloud-core.gemspec
@@ -16,19 +16,8 @@ Gem::Specification.new do |gem|
                        ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-env", ">= 1.0", "< 3.a"
   gem.add_dependency "google-cloud-errors", "~> 1.0"
-
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.14"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-core/lib/google/cloud/config.rb b/google-cloud-core/lib/google/cloud/config.rb
index 1866a76d982e..35fe64f27a7b 100644
--- a/google-cloud-core/lib/google/cloud/config.rb
+++ b/google-cloud-core/lib/google/cloud/config.rb
@@ -257,8 +257,7 @@ def reset! key = nil
             @values[key] = @defaults[key]
             @values[key].reset! if @validators[key] == SUBCONFIG
           elsif @values.key? key
-            warn! "Key #{key.inspect} has not been added, but has a value." \
-                  " Removing the value."
+            warn! "Key #{key.inspect} has not been added, but has a value. Removing the value."
             @values.delete key
           else
             warn! "Key #{key.inspect} does not exist. Nothing to reset."
@@ -521,8 +520,7 @@ def validate_new_key! key
         key_str = key.to_s
         key = key.to_sym
         if key_str !~ /^[a-zA-Z]\w*$/ || ILLEGAL_KEYS.include?(key)
-          warn! "Illegal key name: #{key_str.inspect}. Method dispatch will" \
-                " not work for this key."
+          warn! "Illegal key name: #{key_str.inspect}. Method dispatch will not work for this key."
         end
         warn! "Key #{key.inspect} already exists. It will be replaced." if @validators.key? key
         key
@@ -567,13 +565,11 @@ def validate_value! key, validator, value
         case validator
         when ::Proc
           unless validator.call value
-            warn! "Invalid value #{value.inspect} for key #{key.inspect}." \
-                  " Setting anyway."
+            warn! "Invalid value #{value.inspect} for key #{key.inspect}. Setting anyway."
           end
         when Config
           if value != validator
-            warn! "Key #{key.inspect} refers to a subconfig and shouldn't" \
-                  " be changed. Setting anyway."
+            warn! "Key #{key.inspect} refers to a subconfig and shouldn't be changed. Setting anyway."
           end
         else
           warn! "Key #{key.inspect} has not been added. Setting anyway."
diff --git a/google-cloud-datastore/Gemfile b/google-cloud-datastore/Gemfile
index 698af60db2eb..5156e267fb58 100644
--- a/google-cloud-datastore/Gemfile
+++ b/google-cloud-datastore/Gemfile
@@ -2,9 +2,18 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-datastore-v1", path: "../google-cloud-datastore-v1"
 gem "google-cloud-errors", path: "../google-cloud-errors"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
 gem "minitest-hooks", "~> 1.5"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-datastore/google-cloud-datastore.gemspec b/google-cloud-datastore/google-cloud-datastore.gemspec
index d076bde02310..d8d1065d7663 100644
--- a/google-cloud-datastore/google-cloud-datastore.gemspec
+++ b/google-cloud-datastore/google-cloud-datastore.gemspec
@@ -16,19 +16,8 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "EMULATOR.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.5"
   gem.add_dependency "google-cloud-datastore-v1", "~> 0.0"
-
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-datastore/lib/google-cloud-datastore.rb b/google-cloud-datastore/lib/google-cloud-datastore.rb
index 424e68087b1d..f83fdbcf3176 100644
--- a/google-cloud-datastore/lib/google-cloud-datastore.rb
+++ b/google-cloud-datastore/lib/google-cloud-datastore.rb
@@ -68,8 +68,10 @@ module Cloud
     #   datastore = gcloud.datastore scope: platform_scope
     #
     def datastore scope: nil, timeout: nil, database_id: nil
+      timeout ||= @timeout
       Google::Cloud.datastore @project, @keyfile,
-                              scope: scope, timeout: (timeout || @timeout),
+                              scope: scope,
+                              timeout: timeout,
                               database_id: database_id
     end
 
@@ -117,7 +119,8 @@ def self.datastore project_id = nil, credentials = nil, scope: nil,
       require "google/cloud/datastore"
       Google::Cloud::Datastore.new project_id: project_id,
                                    credentials: credentials,
-                                   scope: scope, timeout: timeout,
+                                   scope: scope,
+                                   timeout: timeout,
                                    database_id: database_id
     end
   end
diff --git a/google-cloud-datastore/lib/google/cloud/datastore.rb b/google-cloud-datastore/lib/google/cloud/datastore.rb
index 540bbb1793bf..c69d4b9424df 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore.rb
@@ -127,7 +127,7 @@ def self.new project_id: nil,
           )
         end
 
-        credentials ||= (keyfile || default_credentials(scope: scope))
+        credentials ||= keyfile || default_credentials(scope: scope)
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Datastore::Credentials.new credentials, scope: scope
         end
diff --git a/google-cloud-datastore/lib/google/cloud/datastore/dataset/aggregate_query_results.rb b/google-cloud-datastore/lib/google/cloud/datastore/dataset/aggregate_query_results.rb
index 827a4bcad923..58f03b58072a 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore/dataset/aggregate_query_results.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore/dataset/aggregate_query_results.rb
@@ -120,10 +120,9 @@ def self.from_grpc aggregate_query_response
                                    [aggregate_alias, value.double_value]
                                  end
                                end
-                               .to_h
 
             new.tap do |s|
-              s.instance_variable_set :@aggregate_fields, aggregate_fields
+              s.instance_variable_set :@aggregate_fields, aggregate_fields.to_h
               s.instance_variable_set :@read_time, aggregate_query_response.batch.read_time
             end
           end
diff --git a/google-cloud-datastore/lib/google/cloud/datastore/gql_query.rb b/google-cloud-datastore/lib/google/cloud/datastore/gql_query.rb
index f3609eab5156..c477971cc109 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore/gql_query.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore/gql_query.rb
@@ -127,15 +127,14 @@ def allow_literals= new_allow_literals
         #   query string to valid GQL arguments
         #
         def named_bindings
-          bindings = Hash[@grpc.named_bindings.map do |name, gql_query_param|
+          bindings_elems = @grpc.named_bindings.map do |name, gql_query_param|
             if gql_query_param.parameter_type == :cursor
               [name, Cursor.from_grpc(gql_query_param.cursor)]
             else
               [name, Convert.from_value(gql_query_param.value)]
             end
-          end]
-          bindings.freeze
-          bindings
+          end
+          bindings_elems.to_h.freeze
         end
 
         ##
diff --git a/google-cloud-datastore/lib/google/cloud/datastore/key.rb b/google-cloud-datastore/lib/google/cloud/datastore/key.rb
index c17b25e21d8c..7da518a306ec 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore/key.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore/key.rb
@@ -261,7 +261,7 @@ def parent= new_parent
         #
         def path
           new_path = parent ? parent.path : []
-          new_path << [kind, (id || name)]
+          new_path << [kind, id || name]
         end
 
         ##
diff --git a/google-cloud-datastore/lib/google/cloud/datastore/properties.rb b/google-cloud-datastore/lib/google/cloud/datastore/properties.rb
index 115e2632544c..5902cceffdbc 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore/properties.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore/properties.rb
@@ -74,12 +74,13 @@ def to_h
 
         def to_grpc
           # Convert to Hash with Google::Cloud::Datastore::V1::Value values.
-          Hash[@hash.map { |k, v| [k.to_s, Convert.to_value(v)] }]
+          @hash.to_h { |k, v| [k.to_s, Convert.to_value(v)] }
         end
 
         def self.from_grpc grpc_map
           # Convert to Hash of string keys and raw values.
-          new Hash[grpc_map.map { |k, v| [k.to_s, Convert.from_value(v)] }]
+          map_elems = grpc_map.map { |k, v| [k.to_s, Convert.from_value(v)] }
+          new map_elems.to_h
         end
 
         protected
diff --git a/google-cloud-datastore/lib/google/cloud/datastore/service.rb b/google-cloud-datastore/lib/google/cloud/datastore/service.rb
index c7bcab20eb23..0297fc0f4918 100644
--- a/google-cloud-datastore/lib/google/cloud/datastore/service.rb
+++ b/google-cloud-datastore/lib/google/cloud/datastore/service.rb
@@ -117,14 +117,13 @@ def run_aggregation_query query, namespace = nil, consistency: nil, transaction:
         def begin_transaction read_only: nil, previous_transaction: nil, read_time: nil
           if read_only
             transaction_options = Google::Cloud::Datastore::V1::TransactionOptions.new
-            transaction_options.read_only = \
+            transaction_options.read_only =
               Google::Cloud::Datastore::V1::TransactionOptions::ReadOnly.new \
                 read_time: read_time_to_timestamp(read_time)
 
           end
           if previous_transaction
-            transaction_options ||= \
-              Google::Cloud::Datastore::V1::TransactionOptions.new
+            transaction_options ||= Google::Cloud::Datastore::V1::TransactionOptions.new
             rw = Google::Cloud::Datastore::V1::TransactionOptions::ReadWrite.new(
               previous_transaction: previous_transaction.encode("ASCII-8BIT")
             )
diff --git a/google-cloud-dns/Gemfile b/google-cloud-dns/Gemfile
index 26087012f224..8ac1bf40723f 100644
--- a/google-cloud-dns/Gemfile
+++ b/google-cloud-dns/Gemfile
@@ -2,7 +2,16 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-dns/google-cloud-dns.gemspec b/google-cloud-dns/google-cloud-dns.gemspec
index 29f80b26dcef..8e735cd3c207 100644
--- a/google-cloud-dns/google-cloud-dns.gemspec
+++ b/google-cloud-dns/google-cloud-dns.gemspec
@@ -16,21 +16,10 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "google-apis-dns_v1", "~> 0.1"
   gem.add_dependency "googleauth", ">= 0.16.2", "< 2.a"
   gem.add_dependency "zonefile", "~> 1.04"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-dns/lib/google-cloud-dns.rb b/google-cloud-dns/lib/google-cloud-dns.rb
index 0d394265cdf7..5a9d694cebb4 100644
--- a/google-cloud-dns/lib/google-cloud-dns.rb
+++ b/google-cloud-dns/lib/google-cloud-dns.rb
@@ -64,9 +64,11 @@ module Cloud
     #   dns = gcloud.dns scope: dns_readonly
     #
     def dns scope: nil, retries: nil, timeout: nil
+      retries ||= @retries
+      timeout ||= @timeout
       Google::Cloud.dns @project, @keyfile, scope: scope,
-                                            retries: (retries || @retries),
-                                            timeout: (timeout || @timeout)
+                                            retries: retries,
+                                            timeout: timeout
     end
 
     ##
diff --git a/google-cloud-dns/lib/google/cloud/dns.rb b/google-cloud-dns/lib/google/cloud/dns.rb
index e595e402bad7..53d63db314e1 100644
--- a/google-cloud-dns/lib/google/cloud/dns.rb
+++ b/google-cloud-dns/lib/google/cloud/dns.rb
@@ -80,7 +80,7 @@ def self.new project_id: nil, credentials: nil, scope: nil, retries: nil,
         retries     ||= configure.retries
         timeout     ||= configure.timeout
         endpoint    ||= configure.endpoint
-        credentials ||= (keyfile || default_credentials(scope: scope))
+        credentials ||= keyfile || default_credentials(scope: scope)
 
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Dns::Credentials.new credentials, scope: scope
diff --git a/google-cloud-dns/lib/google/cloud/dns/service.rb b/google-cloud-dns/lib/google/cloud/dns/service.rb
index a04301bc66b5..46c1961fa899 100644
--- a/google-cloud-dns/lib/google/cloud/dns/service.rb
+++ b/google-cloud-dns/lib/google/cloud/dns/service.rb
@@ -38,15 +38,14 @@ def initialize project, credentials,
           @project = project
           @credentials = credentials
           @service = API::DnsService.new
-          @service.client_options.application_name    = "gcloud-ruby"
-          @service.client_options.application_version = \
-            Google::Cloud::Dns::VERSION
+          @service.client_options.application_name = "gcloud-ruby"
+          @service.client_options.application_version = Google::Cloud::Dns::VERSION
           @service.client_options.open_timeout_sec = timeout
           @service.client_options.read_timeout_sec = timeout
           @service.client_options.send_timeout_sec = timeout
           @service.request_options.retries = retries || 3
           @service.request_options.header ||= {}
-          @service.request_options.header["x-goog-api-client"] = \
+          @service.request_options.header["x-goog-api-client"] =
             "gl-ruby/#{RUBY_VERSION} gccl/#{Google::Cloud::Dns::VERSION}"
           @service.request_options.quota_project = quota_project if quota_project
           @service.authorization = @credentials.client
@@ -84,11 +83,12 @@ def list_zones token: nil, max: nil
         # Returns Google::Apis::DnsV1::ManagedZone
         def create_zone zone_name, zone_dns, description: nil,
                         name_server_set: nil
+          description ||= ""
           managed_zone = Google::Apis::DnsV1::ManagedZone.new(
             kind: "dns#managedZone",
             name: zone_name,
             dns_name: zone_dns,
-            description: (description || ""),
+            description: description,
             name_server_set: name_server_set
           )
           execute { service.create_managed_zone @project, managed_zone }
diff --git a/google-cloud-error_reporting/Gemfile b/google-cloud-error_reporting/Gemfile
index 8fce8690264f..cb9d1e56a6b3 100644
--- a/google-cloud-error_reporting/Gemfile
+++ b/google-cloud-error_reporting/Gemfile
@@ -5,6 +5,16 @@ gemspec
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-error_reporting-v1beta1", path: "../google-cloud-error_reporting-v1beta1"
 gem "google-cloud-errors", path: "../google-cloud-errors"
-gem "stackdriver-core", path: "../stackdriver-core"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.14"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
+gem "rack", ">= 0.1"
+gem "railties", "~> 5.0"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "stackdriver-core", path: "../stackdriver-core"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-error_reporting/google-cloud-error_reporting.gemspec b/google-cloud-error_reporting/google-cloud-error_reporting.gemspec
index 7b2b746de8e7..c2d4e1ec3089 100644
--- a/google-cloud-error_reporting/google-cloud-error_reporting.gemspec
+++ b/google-cloud-error_reporting/google-cloud-error_reporting.gemspec
@@ -18,22 +18,10 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "INSTRUMENTATION.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.5"
   gem.add_dependency "stackdriver-core", "~> 1.3"
   gem.add_dependency "google-cloud-error_reporting-v1beta1", "~> 0.0"
   gem.add_dependency "concurrent-ruby", "~> 1.1"
-
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.14"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "railties", "~> 5.0"
-  gem.add_development_dependency "rack", ">= 0.1"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-error_reporting/lib/google-cloud-error_reporting.rb b/google-cloud-error_reporting/lib/google-cloud-error_reporting.rb
index 09efdf0a3342..4245e9bb2c07 100644
--- a/google-cloud-error_reporting/lib/google-cloud-error_reporting.rb
+++ b/google-cloud-error_reporting/lib/google-cloud-error_reporting.rb
@@ -58,9 +58,10 @@ module Cloud
     #   error_reporting.report error_event
     #
     def error_reporting scope: nil, timeout: nil
+      timeout ||= @timeout
       Google::Cloud.error_reporting @project, @keyfile,
                                     scope: scope,
-                                    timeout: (timeout || @timeout)
+                                    timeout: timeout
     end
 
     ##
diff --git a/google-cloud-error_reporting/lib/google/cloud/error_reporting.rb b/google-cloud-error_reporting/lib/google/cloud/error_reporting.rb
index e128282a6b8e..28aa231c4ef4 100644
--- a/google-cloud-error_reporting/lib/google/cloud/error_reporting.rb
+++ b/google-cloud-error_reporting/lib/google/cloud/error_reporting.rb
@@ -88,7 +88,7 @@ def self.new project_id: nil,
         scope         ||= configure.scope
         timeout       ||= configure.timeout
         endpoint      ||= configure.endpoint
-        credentials   ||= (keyfile || default_credentials(scope: scope))
+        credentials   ||= keyfile || default_credentials(scope: scope)
 
         credentials = resolve_credentials credentials, scope
         project_id = resolve_project_id project_id, credentials
diff --git a/google-cloud-error_reporting/lib/google/cloud/error_reporting/middleware.rb b/google-cloud-error_reporting/lib/google/cloud/error_reporting/middleware.rb
index 37d55248094a..24057a1502f5 100644
--- a/google-cloud-error_reporting/lib/google/cloud/error_reporting/middleware.rb
+++ b/google-cloud-error_reporting/lib/google/cloud/error_reporting/middleware.rb
@@ -180,7 +180,7 @@ def load_config **kwargs
         ##
         # Fallback to default configuration values if not defined already
         def init_default_config
-          configuration.project_id ||= (Cloud.configure.project_id || ErrorReporting::Project.default_project_id)
+          configuration.project_id ||= Cloud.configure.project_id || ErrorReporting::Project.default_project_id
           configuration.credentials ||= Cloud.configure.credentials
           configuration.service_name ||= ErrorReporting::Project.default_service_name
           configuration.service_version ||= ErrorReporting::Project.default_service_version
diff --git a/google-cloud-error_reporting/lib/google/cloud/error_reporting/rails.rb b/google-cloud-error_reporting/lib/google/cloud/error_reporting/rails.rb
index 8537027ebb89..aa81a956ca15 100644
--- a/google-cloud-error_reporting/lib/google/cloud/error_reporting/rails.rb
+++ b/google-cloud-error_reporting/lib/google/cloud/error_reporting/rails.rb
@@ -152,13 +152,13 @@ def self.valid_credentials? project_id, credentials
             end
           rescue StandardError => e
             $stdout.puts "Note: Google::Cloud::ErrorReporting is disabled " \
-              "because it failed to authorize with the service. (#{e.message})"
+                         "because it failed to authorize with the service. (#{e.message})"
             return false
           end
 
           if project_id.to_s.empty?
             $stdout.puts "Note: Google::Cloud::ErrorReporting is disabled " \
-              "because the project ID could not be determined."
+                         "because the project ID could not be determined."
             return false
           end
 
diff --git a/google-cloud-error_reporting/lib/google/cloud/error_reporting/service.rb b/google-cloud-error_reporting/lib/google/cloud/error_reporting/service.rb
index 80eca2b0b1ba..ef43277e5aa8 100644
--- a/google-cloud-error_reporting/lib/google/cloud/error_reporting/service.rb
+++ b/google-cloud-error_reporting/lib/google/cloud/error_reporting/service.rb
@@ -41,7 +41,7 @@ def initialize project, credentials, timeout: nil, host: nil
 
         def error_reporting
           return mocked_error_reporting if mocked_error_reporting
-          @error_reporting ||= \
+          @error_reporting ||=
             V1beta1::ReportErrorsService::Client.new do |config|
               config.credentials = credentials if credentials
               config.timeout = timeout if timeout
diff --git a/google-cloud-errors/Gemfile b/google-cloud-errors/Gemfile
index 33e26f4e4279..19c917cacc81 100644
--- a/google-cloud-errors/Gemfile
+++ b/google-cloud-errors/Gemfile
@@ -2,7 +2,16 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-apis-core", "~> 0.2"
 gem "google-gax", "~> 1.8"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.14"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-errors/Rakefile b/google-cloud-errors/Rakefile
index f1e53006b27b..08c77167ca37 100644
--- a/google-cloud-errors/Rakefile
+++ b/google-cloud-errors/Rakefile
@@ -80,7 +80,6 @@ desc "Start an interactive shell."
 task :console do
   require "irb"
   require "irb/completion"
-  require "pp"
 
   $LOAD_PATH.unshift "lib"
 
diff --git a/google-cloud-errors/google-cloud-errors.gemspec b/google-cloud-errors/google-cloud-errors.gemspec
index 56befaeda5a1..365aa6130340 100644
--- a/google-cloud-errors/google-cloud-errors.gemspec
+++ b/google-cloud-errors/google-cloud-errors.gemspec
@@ -15,16 +15,5 @@ Gem::Specification.new do |gem|
                       ["README.md", "CONTRIBUTING.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
-
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.14"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
+  gem.required_ruby_version = ">= 2.7"
 end
diff --git a/google-cloud-errors/lib/google/cloud/errors.rb b/google-cloud-errors/lib/google/cloud/errors.rb
index 0f87234f15db..c1b8b373ef9f 100644
--- a/google-cloud-errors/lib/google/cloud/errors.rb
+++ b/google-cloud-errors/lib/google/cloud/errors.rb
@@ -132,7 +132,7 @@ def error_info
         @error_info ||= begin
           check_property = lambda do |prop|
             if prop.is_a? Array
-              error_infos = prop.find_all { |status| status.is_a?(::Google::Rpc::ErrorInfo) }
+              error_infos = prop.find_all { |status| status.is_a? ::Google::Rpc::ErrorInfo }
               if error_infos.length == 1
                 error_infos[0]
               end
diff --git a/google-cloud-firestore/Gemfile b/google-cloud-firestore/Gemfile
index 614fb3d0fd0b..577c52be9ab2 100644
--- a/google-cloud-firestore/Gemfile
+++ b/google-cloud-firestore/Gemfile
@@ -2,10 +2,18 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 gem "google-cloud-firestore-v1", path: "../google-cloud-firestore-v1"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
-
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
 gem "stackprof" unless Gem.win_platform?
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-firestore/google-cloud-firestore.gemspec b/google-cloud-firestore/google-cloud-firestore.gemspec
index 3b2ced2a2477..acc7c52f7d4b 100644
--- a/google-cloud-firestore/google-cloud-firestore.gemspec
+++ b/google-cloud-firestore/google-cloud-firestore.gemspec
@@ -17,21 +17,10 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "EMULATOR.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.5"
   gem.add_dependency "google-cloud-firestore-v1", "~> 0.10"
   gem.add_dependency "concurrent-ruby", "~> 1.0"
   gem.add_dependency "rbtree", "~> 0.4.2"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-firestore/lib/google-cloud-firestore.rb b/google-cloud-firestore/lib/google-cloud-firestore.rb
index d6474352156f..1be849045d25 100644
--- a/google-cloud-firestore/lib/google-cloud-firestore.rb
+++ b/google-cloud-firestore/lib/google-cloud-firestore.rb
@@ -74,9 +74,10 @@ def firestore scope: nil,
                   database_id: nil,
                   transport: nil
       transport ||= Google::Cloud.configure.firestore.transport
+      timeout ||= @timeout
       Google::Cloud.firestore @project, @keyfile,
                               scope: scope,
-                              timeout: (timeout || @timeout),
+                              timeout: timeout,
                               database_id: database_id,
                               transport: transport
     end
diff --git a/google-cloud-firestore/lib/google/cloud/firestore.rb b/google-cloud-firestore/lib/google/cloud/firestore.rb
index 1600506ef5b9..a02678721dde 100644
--- a/google-cloud-firestore/lib/google/cloud/firestore.rb
+++ b/google-cloud-firestore/lib/google/cloud/firestore.rb
@@ -84,7 +84,7 @@ def self.new project_id: nil,
                    transport: nil,
                    project: nil,
                    keyfile: nil
-        project_id ||= (project || default_project_id)
+        project_id ||= project || default_project_id
         scope ||= configure.scope
         timeout ||= configure.timeout
         endpoint ||= configure.endpoint
@@ -101,7 +101,7 @@ def self.new project_id: nil,
           return Firestore::Client.new service
         end
 
-        credentials ||= (keyfile || default_credentials(scope: scope))
+        credentials ||= keyfile || default_credentials(scope: scope)
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Firestore::Credentials.new credentials, scope: scope
         end
diff --git a/google-cloud-firestore/lib/google/cloud/firestore/aggregate_query.rb b/google-cloud-firestore/lib/google/cloud/firestore/aggregate_query.rb
index 75099487ba5d..5c9ea66a187d 100644
--- a/google-cloud-firestore/lib/google/cloud/firestore/aggregate_query.rb
+++ b/google-cloud-firestore/lib/google/cloud/firestore/aggregate_query.rb
@@ -207,7 +207,7 @@ def add_avg field, aggregate_alias: nil
         ##
         # @private
         def start new_aggregate
-          combined_aggregates = [].concat(grpc.aggregations).concat([new_aggregate])
+          combined_aggregates = [].concat(grpc.aggregations).push(new_aggregate)
           new_grpc = Google::Cloud::Firestore::V1::StructuredAggregationQuery.new(
             structured_query: @query.query,
             aggregations: combined_aggregates
diff --git a/google-cloud-firestore/lib/google/cloud/firestore/convert.rb b/google-cloud-firestore/lib/google/cloud/firestore/convert.rb
index e288c2b8869f..c74fefc5d27e 100644
--- a/google-cloud-firestore/lib/google/cloud/firestore/convert.rb
+++ b/google-cloud-firestore/lib/google/cloud/firestore/convert.rb
@@ -381,12 +381,12 @@ def field_value_nested? obj, field_value_type = nil
                 return val if val
               end
             when Hash
-              obj.each do |_k, v|
+              obj.each_value do |v|
                 val = field_value_nested? v, field_value_type
                 return val if val
               end
             end
-            nil
+            nil # rubocop:disable Style/ReturnNilInPredicateMethodDefinition
           end
 
           def remove_field_value_from obj, field_value_type = nil
@@ -535,13 +535,13 @@ def deep_merge_hashes left_hash, right_hash
           ESCAPED_FIELD_PATH = /\A`(.*)`\z/.freeze
 
           def build_hash_from_field_paths_and_values pairs
-            pairs.each do |field_path, _value|
-              raise ArgumentError unless field_path.is_a? FieldPath
+            pairs.each do |pair|
+              raise ArgumentError unless pair.first.is_a? FieldPath
             end
 
             dup_hash = {}
 
-            pairs.each do |field_path, value|
+            pairs.each do |(field_path, value)|
               tmp_dup = dup_hash
               last_field = nil
               field_path.fields.map(&:to_sym).each do |field|
diff --git a/google-cloud-firestore/lib/google/cloud/firestore/document_snapshot.rb b/google-cloud-firestore/lib/google/cloud/firestore/document_snapshot.rb
index 68afcfe85174..d40e3037f119 100644
--- a/google-cloud-firestore/lib/google/cloud/firestore/document_snapshot.rb
+++ b/google-cloud-firestore/lib/google/cloud/firestore/document_snapshot.rb
@@ -318,7 +318,7 @@ def <=> other
         ##
         # @private
         def eql? other
-          return nil unless other.is_a? DocumentSnapshot
+          return false unless other.is_a? DocumentSnapshot
           return data.eql? other.data if path == other.path
           path.eql? other.path
         end
diff --git a/google-cloud-logging/Gemfile b/google-cloud-logging/Gemfile
index f6e6a53ecdc9..3825af606f1f 100644
--- a/google-cloud-logging/Gemfile
+++ b/google-cloud-logging/Gemfile
@@ -2,12 +2,23 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-error_reporting", path: "../google-cloud-error_reporting"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 gem "google-cloud-logging-v2", path: "../google-cloud-logging-v2"
 gem "google-cloud-storage", path: "../google-cloud-storage"
-gem "stackdriver-core", path: "../stackdriver-core"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
 gem "minitest-reporters", "~> 1.5.0", require: false
+gem "minitest-rg", "~> 5.2"
+gem "rack", ">= 0.1"
+gem "railties", "~> 5.0"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "stackdriver-core", path: "../stackdriver-core"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-logging/google-cloud-logging.gemspec b/google-cloud-logging/google-cloud-logging.gemspec
index b87b0ca5e962..d8715710ebc0 100644
--- a/google-cloud-logging/google-cloud-logging.gemspec
+++ b/google-cloud-logging/google-cloud-logging.gemspec
@@ -16,23 +16,10 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "INSTRUMENTATION.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.5"
   gem.add_dependency "google-cloud-logging-v2", "~> 0.0"
   gem.add_dependency "stackdriver-core", "~> 1.3"
   gem.add_dependency "concurrent-ruby", "~> 1.1"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
-  gem.add_development_dependency "railties", "~> 5.0"
-  gem.add_development_dependency "rack", ">= 0.1"
 end
diff --git a/google-cloud-logging/lib/google/cloud/logging.rb b/google-cloud-logging/lib/google/cloud/logging.rb
index be2c216f30c6..774bda594d5d 100644
--- a/google-cloud-logging/lib/google/cloud/logging.rb
+++ b/google-cloud-logging/lib/google/cloud/logging.rb
@@ -88,11 +88,11 @@ def self.new project_id: nil,
                    endpoint: nil,
                    project: nil,
                    keyfile: nil
-        project_id    ||= (project || default_project_id)
+        project_id    ||= project || default_project_id
         scope         ||= configure.scope
         timeout       ||= configure.timeout
         endpoint      ||= configure.endpoint
-        credentials   ||= (keyfile || default_credentials(scope: scope))
+        credentials   ||= keyfile || default_credentials(scope: scope)
 
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Logging::Credentials.new credentials, scope: scope
diff --git a/google-cloud-logging/lib/google/cloud/logging/middleware.rb b/google-cloud-logging/lib/google/cloud/logging/middleware.rb
index da98a711e441..6a025d24c1ea 100644
--- a/google-cloud-logging/lib/google/cloud/logging/middleware.rb
+++ b/google-cloud-logging/lib/google/cloud/logging/middleware.rb
@@ -288,7 +288,7 @@ def load_config **kwargs
         ##
         # Fallback to default configuration values if not defined already
         def init_default_config
-          configuration.project_id ||= (Cloud.configure.project_id || Logging.default_project_id)
+          configuration.project_id ||= Cloud.configure.project_id || Logging.default_project_id
           configuration.credentials ||= Cloud.configure.credentials
           configuration.log_name ||= DEFAULT_LOG_NAME
           configuration.log_name_map ||= DEFAULT_LOG_NAME_MAP
diff --git a/google-cloud-logging/lib/google/cloud/logging/service.rb b/google-cloud-logging/lib/google/cloud/logging/service.rb
index 34fca01e1e44..4d62c91ec3d8 100644
--- a/google-cloud-logging/lib/google/cloud/logging/service.rb
+++ b/google-cloud-logging/lib/google/cloud/logging/service.rb
@@ -41,7 +41,7 @@ def initialize project, credentials, timeout: nil, host: nil
 
         def logging
           return mocked_logging if mocked_logging
-          @logging ||= \
+          @logging ||=
             V2::LoggingService::Client.new do |config|
               config.credentials = credentials if credentials
               config.timeout = timeout if timeout
@@ -55,7 +55,7 @@ def logging
 
         def sinks
           return mocked_sinks if mocked_sinks
-          @sinks ||= \
+          @sinks ||=
             V2::ConfigService::Client.new do |config|
               config.credentials = credentials if credentials
               config.timeout = timeout if timeout
@@ -69,7 +69,7 @@ def sinks
 
         def metrics
           return mocked_metrics if mocked_metrics
-          @metrics ||= \
+          @metrics ||=
             V2::MetricsService::Client.new do |config|
               config.credentials = credentials if credentials
               config.timeout = timeout if timeout
diff --git a/google-cloud-pubsub/.rubocop.yml b/google-cloud-pubsub/.rubocop.yml
index 4196b54fe175..29a0970803d6 100644
--- a/google-cloud-pubsub/.rubocop.yml
+++ b/google-cloud-pubsub/.rubocop.yml
@@ -28,3 +28,6 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - "lib/google-cloud-pubsub.rb"
+Style/ReturnNilInPredicateMethodDefinition:
+  Exclude:
+    - "lib/google/cloud/pubsub/subscriber/stream.rb"
diff --git a/google-cloud-pubsub/Gemfile b/google-cloud-pubsub/Gemfile
index 562d52872d9a..d35c528ed16a 100644
--- a/google-cloud-pubsub/Gemfile
+++ b/google-cloud-pubsub/Gemfile
@@ -2,12 +2,21 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
+gem "avro", "~> 1.10"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 gem "google-cloud-pubsub-v1", path: "../google-cloud-pubsub-v1"
-gem "retriable", "~> 3.1"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
 gem "minitest-reporters", "~> 1.5.0", require: false
-gem "rake"
-
+gem "minitest-rg", "~> 5.2"
 gem "pry", "~> 0.14.1"
+gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "retriable", "~> 3.1"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-pubsub/Rakefile b/google-cloud-pubsub/Rakefile
index 24f0e54a838c..1537c62ea5a3 100644
--- a/google-cloud-pubsub/Rakefile
+++ b/google-cloud-pubsub/Rakefile
@@ -152,7 +152,6 @@ desc "Start an interactive shell."
 task :console do
   require "irb"
   require "irb/completion"
-  require "pp"
 
   $LOAD_PATH.unshift "lib"
 
diff --git a/google-cloud-pubsub/google-cloud-pubsub.gemspec b/google-cloud-pubsub/google-cloud-pubsub.gemspec
index ec56a1b4c6ab..90209d60d2f9 100644
--- a/google-cloud-pubsub/google-cloud-pubsub.gemspec
+++ b/google-cloud-pubsub/google-cloud-pubsub.gemspec
@@ -16,22 +16,10 @@ Gem::Specification.new do |gem|
                        "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "concurrent-ruby", "~> 1.1"
   gem.add_dependency "google-cloud-core", "~> 1.5"
   gem.add_dependency "google-cloud-pubsub-v1", "~> 0.20"
   gem.add_dependency "retriable", "~> 3.1"
-
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "avro", "~> 1.10"
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-pubsub/lib/google/cloud/pubsub.rb b/google-cloud-pubsub/lib/google/cloud/pubsub.rb
index 8a3b9ceb779a..b0e7a00ce437 100644
--- a/google-cloud-pubsub/lib/google/cloud/pubsub.rb
+++ b/google-cloud-pubsub/lib/google/cloud/pubsub.rb
@@ -83,7 +83,7 @@ def self.new project_id: nil,
                    emulator_host: nil,
                    project: nil,
                    keyfile: nil
-        project_id ||= (project || default_project_id)
+        project_id ||= project || default_project_id
         scope ||= configure.scope
         timeout ||= configure.timeout
         endpoint ||= configure.endpoint
@@ -94,7 +94,7 @@ def self.new project_id: nil,
           credentials = :this_channel_is_insecure
           endpoint = emulator_host
         else
-          credentials ||= (keyfile || default_credentials(scope: scope))
+          credentials ||= keyfile || default_credentials(scope: scope)
           unless credentials.is_a? Google::Auth::Credentials
             credentials = PubSub::Credentials.new credentials, scope: scope
           end
diff --git a/google-cloud-pubsub/lib/google/cloud/pubsub/convert.rb b/google-cloud-pubsub/lib/google/cloud/pubsub/convert.rb
index 4a0885da08af..ea4f63944525 100644
--- a/google-cloud-pubsub/lib/google/cloud/pubsub/convert.rb
+++ b/google-cloud-pubsub/lib/google/cloud/pubsub/convert.rb
@@ -69,7 +69,7 @@ def pubsub_message data, attributes, ordering_key, extra_attrs
             data_bytes = String(data).dup.force_encoding(Encoding::ASCII_8BIT).freeze
 
             # Convert attributes to strings to match the protobuf definition
-            attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
+            attributes = attributes.to_h { |k, v| [String(k), String(v)] }
 
             # Ordering Key must always be a string
             ordering_key = String(ordering_key).freeze
diff --git a/google-cloud-pubsub/lib/google/cloud/pubsub/flow_controller.rb b/google-cloud-pubsub/lib/google/cloud/pubsub/flow_controller.rb
index 7842321ff91e..42696c45bb11 100644
--- a/google-cloud-pubsub/lib/google/cloud/pubsub/flow_controller.rb
+++ b/google-cloud-pubsub/lib/google/cloud/pubsub/flow_controller.rb
@@ -84,7 +84,6 @@ def release message_size
 
         protected
 
-        # rubocop:disable Style/IdenticalConditionalBranches
         # rubocop:disable Style/GuardClause
 
         def acquire_or_wait message_size
@@ -117,7 +116,6 @@ def acquire_or_wait message_size
           end
         end
 
-        # rubocop:enable Style/IdenticalConditionalBranches
         # rubocop:enable Style/GuardClause
 
         def is_new_and_others_wait? waiter
diff --git a/google-cloud-pubsub/lib/google/cloud/pubsub/message.rb b/google-cloud-pubsub/lib/google/cloud/pubsub/message.rb
index d6afad9e15e5..975a7f560837 100644
--- a/google-cloud-pubsub/lib/google/cloud/pubsub/message.rb
+++ b/google-cloud-pubsub/lib/google/cloud/pubsub/message.rb
@@ -62,7 +62,7 @@ class Message
         # This can be used to publish several messages in bulk.
         def initialize data = nil, attributes = {}
           # Convert attributes to strings to match the protobuf definition
-          attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
+          attributes = attributes.to_h { |k, v| [String(k), String(v)] }
 
           @grpc = Google::Cloud::PubSub::V1::PubsubMessage.new(
             data:       String(data).dup.force_encoding(Encoding::ASCII_8BIT),
@@ -81,8 +81,7 @@ def data
         # Optional attributes for the message.
         def attributes
           return @grpc.attributes.to_h if @grpc.attributes.respond_to? :to_h
-          # Enumerable doesn't have to_h on Ruby 2.0, so fallback to this
-          Hash[@grpc.attributes.to_a]
+          @grpc.attributes.to_a.to_h
         end
 
         ##
diff --git a/google-cloud-pubsub/lib/google/cloud/pubsub/service.rb b/google-cloud-pubsub/lib/google/cloud/pubsub/service.rb
index c05fa5d31899..241fbcb54165 100644
--- a/google-cloud-pubsub/lib/google/cloud/pubsub/service.rb
+++ b/google-cloud-pubsub/lib/google/cloud/pubsub/service.rb
@@ -262,7 +262,7 @@ def acknowledge subscription, *ack_ids
         # Modifies the PushConfig for a specified subscription.
         def modify_push_config subscription, endpoint, attributes
           # Convert attributes to strings to match the protobuf definition
-          attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
+          attributes = attributes.to_h { |k, v| [String(k), String(v)] }
           push_config = Google::Cloud::PubSub::V1::PushConfig.new(
             push_endpoint: endpoint,
             attributes:    attributes
diff --git a/google-cloud-pubsub/samples/pubsub_publish_with_ordering_keys.rb b/google-cloud-pubsub/samples/pubsub_publish_with_ordering_keys.rb
index 60c9a319a592..3ea786ff7c17 100644
--- a/google-cloud-pubsub/samples/pubsub_publish_with_ordering_keys.rb
+++ b/google-cloud-pubsub/samples/pubsub_publish_with_ordering_keys.rb
@@ -28,7 +28,7 @@ def publish_ordered_messages topic_id:
   }
   topic.enable_message_ordering!
   10.times do |i|
-    topic.publish_async "This is message \##{i}.",
+    topic.publish_async "This is message ##{i}.",
                         ordering_key: "ordering-key"
   end
 
diff --git a/google-cloud-pubsub/samples/pubsub_publisher_batch_settings.rb b/google-cloud-pubsub/samples/pubsub_publisher_batch_settings.rb
index 90a01d01a761..b9527df41396 100644
--- a/google-cloud-pubsub/samples/pubsub_publisher_batch_settings.rb
+++ b/google-cloud-pubsub/samples/pubsub_publisher_batch_settings.rb
@@ -27,7 +27,7 @@ def publish_messages_async_with_batch_settings topic_id:
     max_messages: 20
   }
   10.times do |i|
-    topic.publish_async "This is message \##{i}."
+    topic.publish_async "This is message ##{i}."
   end
 
   # Stop the async_publisher to send all queued messages immediately.
diff --git a/google-cloud-pubsub/samples/pubsub_resume_publish_with_ordering_keys.rb b/google-cloud-pubsub/samples/pubsub_resume_publish_with_ordering_keys.rb
index 8925707be1b3..e2d8844aa033 100644
--- a/google-cloud-pubsub/samples/pubsub_resume_publish_with_ordering_keys.rb
+++ b/google-cloud-pubsub/samples/pubsub_resume_publish_with_ordering_keys.rb
@@ -28,12 +28,12 @@ def publish_resume_publish topic_id:
   }
   topic.enable_message_ordering!
   10.times do |i|
-    topic.publish_async "This is message \##{i}.",
+    topic.publish_async "This is message ##{i}.",
                         ordering_key: "ordering-key" do |result|
       if result.succeeded?
-        puts "Message \##{i} successfully published."
+        puts "Message ##{i} successfully published."
       else
-        puts "Message \##{i} failed to publish"
+        puts "Message ##{i} failed to publish"
         # Allow publishing to continue on "ordering-key" after processing the
         # failure.
         topic.resume_publish "ordering-key"
diff --git a/google-cloud-resource_manager/Gemfile b/google-cloud-resource_manager/Gemfile
index 26087012f224..8ac1bf40723f 100644
--- a/google-cloud-resource_manager/Gemfile
+++ b/google-cloud-resource_manager/Gemfile
@@ -2,7 +2,16 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-resource_manager/google-cloud-resource_manager.gemspec b/google-cloud-resource_manager/google-cloud-resource_manager.gemspec
index a654c3fbf4be..a9db644d6f3d 100644
--- a/google-cloud-resource_manager/google-cloud-resource_manager.gemspec
+++ b/google-cloud-resource_manager/google-cloud-resource_manager.gemspec
@@ -16,20 +16,9 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "google-apis-cloudresourcemanager_v1", "~> 0.1"
   gem.add_dependency "googleauth", ">= 0.16.2", "< 2.a"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/google-cloud-resource_manager/lib/google-cloud-resource_manager.rb b/google-cloud-resource_manager/lib/google-cloud-resource_manager.rb
index e432e66175ab..14fb51e4ac2a 100644
--- a/google-cloud-resource_manager/lib/google-cloud-resource_manager.rb
+++ b/google-cloud-resource_manager/lib/google-cloud-resource_manager.rb
@@ -65,9 +65,11 @@ module Cloud
     #   resource_manager = gcloud.resource_manager scope: readonly_scope
     #
     def resource_manager scope: nil, retries: nil, timeout: nil
+      retries ||= @retries
+      timeout ||= @timeout
       Google::Cloud.resource_manager @keyfile, scope: scope,
-                                               retries: (retries || @retries),
-                                               timeout: (timeout || @timeout)
+                                               retries: retries,
+                                               timeout: timeout
     end
 
     ##
diff --git a/google-cloud-resource_manager/lib/google/cloud/resource_manager/service.rb b/google-cloud-resource_manager/lib/google/cloud/resource_manager/service.rb
index 11c926b36d81..323e815bbbd6 100644
--- a/google-cloud-resource_manager/lib/google/cloud/resource_manager/service.rb
+++ b/google-cloud-resource_manager/lib/google/cloud/resource_manager/service.rb
@@ -36,18 +36,15 @@ class Service
         def initialize credentials, retries: nil, timeout: nil, host: nil, quota_project: nil
           @credentials = credentials
           @service = API::CloudResourceManagerService.new
-          @service.client_options.application_name = \
-            "gcloud-ruby"
-          @service.client_options.application_version = \
-            Google::Cloud::ResourceManager::VERSION
+          @service.client_options.application_name = "gcloud-ruby"
+          @service.client_options.application_version = Google::Cloud::ResourceManager::VERSION
           @service.client_options.open_timeout_sec = timeout
           @service.client_options.read_timeout_sec = timeout
           @service.client_options.send_timeout_sec = timeout
           @service.request_options.retries = retries || 3
           @service.request_options.header ||= {}
-          @service.request_options.header["x-goog-api-client"] = \
-            "gl-ruby/#{RUBY_VERSION} " \
-            "gccl/#{Google::Cloud::ResourceManager::VERSION}"
+          @service.request_options.header["x-goog-api-client"] =
+            "gl-ruby/#{RUBY_VERSION} gccl/#{Google::Cloud::ResourceManager::VERSION}"
           @service.request_options.quota_project = quota_project if quota_project
           @service.authorization = @credentials.client
           @service.root_url = host if host
diff --git a/google-cloud-trace/Gemfile b/google-cloud-trace/Gemfile
index 7916f0033a27..a92d2827729a 100644
--- a/google-cloud-trace/Gemfile
+++ b/google-cloud-trace/Gemfile
@@ -2,10 +2,22 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "activerecord", "~> 5.0"
+gem "autotest-suffix", "~> 1.1"
+gem "faraday", "~> 1.3"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 gem "google-cloud-trace-v1", path: "../google-cloud-trace-v1"
 gem "google-cloud-trace-v2", path: "../google-cloud-trace-v2"
-gem "stackdriver-core", path: "../stackdriver-core"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
+gem "railties", "~> 5.0"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "stackdriver-core", path: "../stackdriver-core"
+gem "yard", "~> 0.9"
+gem "yard-doctest" # , "~> 0.1.6"
diff --git a/google-cloud-trace/google-cloud-trace.gemspec b/google-cloud-trace/google-cloud-trace.gemspec
index d523d6e5e34c..7f6f7ebea45d 100644
--- a/google-cloud-trace/google-cloud-trace.gemspec
+++ b/google-cloud-trace/google-cloud-trace.gemspec
@@ -18,25 +18,11 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "AUTHENTICATION.md", "INSTRUMENTATION.md", "LOGGING.md", "CONTRIBUTING.md", "TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.5"
   gem.add_dependency "stackdriver-core", "~> 1.3"
   gem.add_dependency "concurrent-ruby", "~> 1.1"
   gem.add_dependency "google-cloud-trace-v1", "~> 0.0"
   gem.add_dependency "google-cloud-trace-v2", "~> 0.0"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "faraday", "~> 1.3"
-  gem.add_development_dependency "railties", "~> 5.0"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest" #, "~> 0.1.6"
-  gem.add_development_dependency "activerecord", "~> 5.0"
 end
diff --git a/google-cloud-trace/lib/google-cloud-trace.rb b/google-cloud-trace/lib/google-cloud-trace.rb
index d92865d9c69a..9135d97b6da3 100644
--- a/google-cloud-trace/lib/google-cloud-trace.rb
+++ b/google-cloud-trace/lib/google-cloud-trace.rb
@@ -58,8 +58,9 @@ module Cloud
     #   end
     #
     def trace scope: nil, timeout: nil
+      timeout ||= @timeout
       Google::Cloud.trace @project, @keyfile, scope: scope,
-                                              timeout: (timeout || @timeout)
+                                              timeout: timeout
     end
 
     ##
diff --git a/google-cloud-trace/lib/google/cloud/trace.rb b/google-cloud-trace/lib/google/cloud/trace.rb
index 86eb3e37427c..a424031666c6 100644
--- a/google-cloud-trace/lib/google/cloud/trace.rb
+++ b/google-cloud-trace/lib/google/cloud/trace.rb
@@ -93,11 +93,11 @@ def self.new project_id: nil,
                    endpoint: nil,
                    project: nil,
                    keyfile: nil
-        project_id    ||= (project || default_project_id)
+        project_id    ||= project || default_project_id
         scope         ||= configure.scope
         timeout       ||= configure.timeout
         endpoint      ||= configure.endpoint
-        credentials   ||= (keyfile || default_credentials(scope: scope))
+        credentials   ||= keyfile || default_credentials(scope: scope)
 
         credentials = resolve_credentials credentials, scope
         if credentials.respond_to? :project_id
diff --git a/google-cloud-translate-v2/Gemfile b/google-cloud-translate-v2/Gemfile
index bea5da8ab61c..c97a59aec06f 100644
--- a/google-cloud-translate-v2/Gemfile
+++ b/google-cloud-translate-v2/Gemfile
@@ -4,3 +4,12 @@ gemspec
 
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.16"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
+gem "rake", ">= 12.0"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.18"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/google-cloud-translate-v2/google-cloud-translate-v2.gemspec b/google-cloud-translate-v2/google-cloud-translate-v2.gemspec
index f96197a0d918..12290eeadbec 100644
--- a/google-cloud-translate-v2/google-cloud-translate-v2.gemspec
+++ b/google-cloud-translate-v2/google-cloud-translate-v2.gemspec
@@ -17,21 +17,11 @@ Gem::Specification.new do |gem|
                       ["README.md", "LICENSE.md", "AUTHENTICATION.md", "CHANGELOG.md", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "faraday", ">= 0.17.3", "< 2.a"
   gem.add_dependency "googleapis-common-protos", ">= 1.3.10", "< 2.a"
   gem.add_dependency "googleapis-common-protos-types", ">= 1.0.5", "< 2.a"
   gem.add_dependency "googleauth", ">= 0.16.2", "< 2.a"
   gem.add_dependency "google-cloud-core", "~> 1.6"
-
-  gem.add_development_dependency "google-style", "~> 1.26.1"
-  gem.add_development_dependency "minitest", "~> 5.16"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "rake", ">= 12.0"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.18"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/stackdriver-core/Gemfile b/stackdriver-core/Gemfile
index 26087012f224..7eee903a22a4 100644
--- a/stackdriver-core/Gemfile
+++ b/stackdriver-core/Gemfile
@@ -2,7 +2,16 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-errors", path: "../google-cloud-errors"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.14"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.13"
diff --git a/stackdriver-core/Rakefile b/stackdriver-core/Rakefile
index 08a25b94d7ac..cba019b11b9c 100644
--- a/stackdriver-core/Rakefile
+++ b/stackdriver-core/Rakefile
@@ -81,7 +81,6 @@ desc "Start an interactive shell."
 task :console do
   require "irb"
   require "irb/completion"
-  require "pp"
 
   $LOAD_PATH.unshift "lib"
 
diff --git a/stackdriver-core/lib/stackdriver/core/trace_context.rb b/stackdriver-core/lib/stackdriver/core/trace_context.rb
index 0fc9a57af51c..3406cc4b9ef9 100644
--- a/stackdriver-core/lib/stackdriver/core/trace_context.rb
+++ b/stackdriver-core/lib/stackdriver/core/trace_context.rb
@@ -75,7 +75,7 @@ def initialize trace_id: nil, is_new: nil, span_id: nil, sampled: nil,
                   else
                     is_new ? true : false
                   end
-        @span_id = span_id ? span_id.to_i : nil
+        @span_id = span_id&.to_i
         @sampled = sampled
         if @sampled.nil?
           @capture_stack = nil
@@ -153,8 +153,7 @@ def eql? other
       # @return [Integer]
       #
       def hash
-        @hash ||= @trace_id.hash ^ @is_new.hash ^ @span_id.hash ^
-                  @sampled.hash ^ @capture_stack.hash
+        @hash ||= [@trace_id, @is_new, @span_id, @sampled, @capture_stack].hash
       end
 
       ##
@@ -229,8 +228,8 @@ def self.parse_string str
         return unless match
 
         trace_id = match[1]
-        span_id = match[3] ? match[3].to_i : nil
-        options = match[5] ? match[5].to_i : nil
+        span_id = match[3]&.to_i
+        options = match[5]&.to_i
         if options.nil?
           sampled = capture_stack = nil
         else
diff --git a/stackdriver-core/stackdriver-core.gemspec b/stackdriver-core/stackdriver-core.gemspec
index fa9ac3543697..518edafa0fe3 100644
--- a/stackdriver-core/stackdriver-core.gemspec
+++ b/stackdriver-core/stackdriver-core.gemspec
@@ -15,18 +15,7 @@ Gem::Specification.new do |gem|
                       ["OVERVIEW.md", "CONTRIBUTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_dependency "google-cloud-core", "~> 1.2"
-
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.14"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.13"
 end
diff --git a/stackdriver/Gemfile b/stackdriver/Gemfile
index e9db57b049db..1a04c29d4829 100644
--- a/stackdriver/Gemfile
+++ b/stackdriver/Gemfile
@@ -2,11 +2,21 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "autotest-suffix", "~> 1.1"
 gem "google-cloud-core", path: "../google-cloud-core"
 gem "google-cloud-error_reporting", path: "../google-cloud-error_reporting"
 gem "google-cloud-errors", path: "../google-cloud-errors"
 gem "google-cloud-logging", path: "../google-cloud-logging"
 gem "google-cloud-trace", path: "../google-cloud-trace"
-gem "stackdriver-core", path: "../stackdriver-core"
-
+gem "google-style", "~> 1.27.1"
+gem "minitest", "~> 5.14"
+gem "minitest-autotest", "~> 1.0"
+gem "minitest-focus", "~> 1.1"
+gem "minitest-rg", "~> 5.2"
+gem "railties", "~> 5.0"
 gem "rake"
+gem "redcarpet", "~> 3.0"
+gem "simplecov", "~> 0.9"
+gem "stackdriver-core", path: "../stackdriver-core"
+gem "yard", "~> 0.9"
+gem "yard-doctest", "~> 0.1.6"
diff --git a/stackdriver/Rakefile b/stackdriver/Rakefile
index ea50bc2b6243..d4a0dd457462 100644
--- a/stackdriver/Rakefile
+++ b/stackdriver/Rakefile
@@ -96,7 +96,6 @@ desc "Start an interactive shell."
 task :console do
   require "irb"
   require "irb/completion"
-  require "pp"
 
   $LOAD_PATH.unshift "lib"
 
diff --git a/stackdriver/stackdriver.gemspec b/stackdriver/stackdriver.gemspec
index 1e95956607fe..56790dca083a 100644
--- a/stackdriver/stackdriver.gemspec
+++ b/stackdriver/stackdriver.gemspec
@@ -16,21 +16,9 @@ Gem::Specification.new do |gem|
                        "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.add_runtime_dependency "google-cloud-error_reporting", "~> 0.41"
   gem.add_runtime_dependency "google-cloud-logging", "~> 2.1"
   gem.add_runtime_dependency "google-cloud-trace", "~> 0.40"
-
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
-  gem.add_development_dependency "google-style", "~> 1.25.1"
-  gem.add_development_dependency "minitest", "~> 5.14"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
-  gem.add_development_dependency "minitest-focus", "~> 1.1"
-  gem.add_development_dependency "minitest-rg", "~> 5.2"
-  gem.add_development_dependency "railties", "~> 5.0"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "yard-doctest", "~> 0.1.6"
 end