From ca7a0175ca510648ad42a1880da833d3637a819e Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:07:18 -0400
Subject: [PATCH 1/4] Update google-utilities.yml

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

diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml
index 0b47799..8fa625a 100644
--- a/.github/workflows/google-utilities.yml
+++ b/.github/workflows/google-utilities.yml
@@ -53,7 +53,7 @@ jobs:
     steps:
     - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314
       with:
-        ruby-version: "2.7"
+        ruby-version: "3.4"
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Setup Scripts Directory
       run: ./setup-scripts.sh

From 896538e64b631deeb497c71453f28402f84789cd Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Wed, 24 Jun 2026 14:26:48 -0400
Subject: [PATCH 2/4] updates

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index d86a8e9..870c653 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,5 +3,5 @@
 source 'https://rubygems.org'
 
 gem 'cocoapods', '1.15.2'
-gem 'cocoapods-generate', '2.0.1'
+gem 'cocoapods-generate', '2.2.4'
 gem 'danger', '8.4.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index c4b0f9b..192492d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,10 +57,10 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-disable-podfile-validations (0.1.1)
+    cocoapods-disable-podfile-validations (0.2.0)
     cocoapods-downloader (2.1)
-    cocoapods-generate (2.0.1)
-      cocoapods-disable-podfile-validations (~> 0.1.1)
+    cocoapods-generate (2.2.4)
+      cocoapods-disable-podfile-validations (>= 0.1.1, < 0.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -171,8 +171,8 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (= 1.15.2)
-  cocoapods-generate (= 2.0.1)
+  cocoapods-generate (= 2.2.4)
   danger (= 8.4.5)
 
 BUNDLED WITH
-   2.1.4
+   2.4.22

From 421cdf58355b83e793065389abb700dfa5611e6d Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:34:48 -0400
Subject: [PATCH 3/4] Update google-utilities.yml

---
 .github/workflows/google-utilities.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml
index 8fa625a..d2c636b 100644
--- a/.github/workflows/google-utilities.yml
+++ b/.github/workflows/google-utilities.yml
@@ -80,9 +80,15 @@ jobs:
       run: |
         sudo xcode-select -s /Applications/Xcode_26.4.app/Contents/Developer
         xcodebuild -list
-    - name: Install Simulator
+    - name: Install simulators in case they are missing.
       if: matrix.target == 'iOS'
-      run: xcodebuild -downloadPlatform ${{ matrix.target }}
+      uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
+      with:
+        timeout_minutes: 15
+        max_attempts: 5
+        retry_wait_seconds: 120
+        continue_on_error: true
+        command: xcodebuild -downloadPlatform ${{ matrix.target }}    
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh scripts/build.sh GoogleUtilities-Package ${{ matrix.target }} spm
 

From dab01aa5d3185f3c13d32c04c048c2fa5e347675 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:45:31 -0400
Subject: [PATCH 4/4] Apply suggestion from @ncooke3

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

diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml
index d2c636b..af57077 100644
--- a/.github/workflows/google-utilities.yml
+++ b/.github/workflows/google-utilities.yml
@@ -88,7 +88,7 @@ jobs:
         max_attempts: 5
         retry_wait_seconds: 120
         continue_on_error: true
-        command: xcodebuild -downloadPlatform ${{ matrix.target }}    
+        command: xcodebuild -downloadPlatform ${{ matrix.target }}
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh scripts/build.sh GoogleUtilities-Package ${{ matrix.target }} spm