From 12b5cab0db154bf9046b3dba9100896f58cdce4f Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 27 Feb 2024 18:38:24 -0500
Subject: [PATCH] Move CI to macos-14 and use Xcode 14.2.

---
 .github/workflows/cocoapods.yml         | 10 ++++++++--
 .github/workflows/examples.yml          |  5 ++++-
 .github/workflows/service_generator.yml |  7 +++++--
 .github/workflows/swiftpm.yml           | 12 +++++++++---
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml
index 84d71ddff..481586123 100644
--- a/.github/workflows/cocoapods.yml
+++ b/.github/workflows/cocoapods.yml
@@ -24,13 +24,16 @@ jobs:
   # time, so this covers the Core spec and tests.
   pod-lib-lint-core:
     name: CocoaPods lib lint Core
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         pod_configuration: ["Debug", "Release"]
         extra_flags: ["", "--use-static-frameworks"]
     steps:
+    # The "macos-14" image defaults to 15.0.1, select the newer Xcode.
+    - name: Xcode version
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
     - uses: actions/checkout@v4
     - name: "iOS, macOS, and tvOS"
       run:  |
@@ -55,12 +58,15 @@ jobs:
   # resources without any real gain.
   pod-lib-lint-subspecs:
     name: CocoaPods lib lint SubSpecs
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         pod_configuration: ["Debug", "Release"]
     steps:
+    # The "macos-14" image defaults to 15.0.1, select the newer Xcode.
+    - name: Xcode version
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
     - uses: actions/checkout@v4
     - name: "macOS"
       run:  |
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 057792504..487e10435 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -31,12 +31,15 @@ on:
 
 jobs:
   examples:
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         SAMPLE: ["Calendar", "Drive", "YouTube", "Storage"]
     steps:
+    # The "macos-14" image defaults to 15.0.1, select the newer Xcode.
+    - name: Xcode version
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
     - uses: actions/checkout@v4
     - name: Build Debug
       run:  |
diff --git a/.github/workflows/service_generator.yml b/.github/workflows/service_generator.yml
index 1fd5d42a0..e242c921e 100644
--- a/.github/workflows/service_generator.yml
+++ b/.github/workflows/service_generator.yml
@@ -29,7 +29,7 @@ on:
 
 jobs:
   swift:
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
@@ -43,12 +43,15 @@ jobs:
         swift build --configuration ${{ matrix.CONFIGURATION }}
 
   xcodebuild:
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         CONFIGURATION: ["Debug", "Release"]
     steps:
+    # The "macos-14" image defaults to 15.0.1, select the newer Xcode.
+    - name: Xcode version
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
     - uses: actions/checkout@v4
     - name: Build ServiceGenerator
       run:  |
diff --git a/.github/workflows/swiftpm.yml b/.github/workflows/swiftpm.yml
index 16e661aa8..c0c20a6be 100644
--- a/.github/workflows/swiftpm.yml
+++ b/.github/workflows/swiftpm.yml
@@ -24,12 +24,15 @@ on:
 jobs:
   swift:
     # The swift command line only support build/testing for macOS on.
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         CONFIGURATION: ["debug", "release"]
     steps:
+    # The "macos-14" image defaults to 15.0.1, select the newer Xcode.
+    - name: Xcode version
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
     - uses: actions/checkout@v4
     - name: Build and Test Library
       run:  |
@@ -40,20 +43,23 @@ jobs:
   xcodebuild:
     # Job(s) to build for all the platforms to ensure that is working and the
     # tests are passing.
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         PLATFORM: ["ios", "macos", "tvos", "watchos"]
         CONFIGURATION: ["Debug", "Release"]
     steps:
+    # The "macos-14" image defaults to 15.0.1, select the newer Xcode.
+    - name: Xcode version
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
     - uses: actions/checkout@v4
     - name: Build and Test Library
       run:  |
         set -eu
         case "${{matrix.PLATFORM}}" in
           ios)
-            DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=latest"
+            DESTINATION="platform=iOS Simulator,name=iPhone 14,OS=latest"
             ;;
           macos)
             DESTINATION="platform=macOS"