From c57aeac4518b17f496bc2245ccc22756a15db601 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Fri, 8 Nov 2024 12:11:47 -0500
Subject: [PATCH] Run CI on macOS 15 with the iPhone 16 simulator

---
 .github/workflows/abtesting.yml      | 8 ++++----
 .github/workflows/admob.yml          | 4 ++--
 .github/workflows/analytics.yml      | 4 ++--
 .github/workflows/authentication.yml | 4 ++--
 .github/workflows/check.yml          | 2 +-
 .github/workflows/config.yml         | 6 +++---
 .github/workflows/crashlytics.yml    | 8 ++++----
 .github/workflows/database.yml       | 8 ++++----
 .github/workflows/dynamiclinks.yml   | 4 ++--
 .github/workflows/firestore.yml      | 4 ++--
 .github/workflows/functions.yml      | 4 ++--
 .github/workflows/inappmessaging.yml | 4 ++--
 .github/workflows/installations.yml  | 4 ++--
 .github/workflows/messaging.yml      | 4 ++--
 .github/workflows/performance.yml    | 8 ++++----
 .github/workflows/storage.yml        | 8 ++++----
 scripts/framework_test.sh            | 4 ++--
 scripts/test.sh                      | 2 +-
 18 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml
index e26962da8..8dda07cfa 100644
--- a/.github/workflows/abtesting.yml
+++ b/.github/workflows/abtesting.yml
@@ -33,7 +33,7 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       TEST: true
@@ -55,17 +55,17 @@ jobs:
           LEGACY: true
           SWIFT_SUFFIX: ""
           OS: iOS
-          DEVICE: iPhone 14
+          DEVICE: iPhone 16
   spm:
     name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["15.3"]
         os: [iOS, tvOS, macOS, watchOS, catalyst]
         include:
           - os: iOS
-            device: iPhone 15
+            device: iPhone 16
             # Test runs locally but fails in CI with:
             # (Underlying Error: lstat of
             # /Users/runner/Library/Developer/CoreSimulator/Devices/
diff --git a/.github/workflows/admob.yml b/.github/workflows/admob.yml
index e6acbf47a..490e1545e 100644
--- a/.github/workflows/admob.yml
+++ b/.github/workflows/admob.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: false
     steps:
       - name: Checkout
diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml
index d36444683..bff5ff664 100644
--- a/.github/workflows/analytics.yml
+++ b/.github/workflows/analytics.yml
@@ -29,14 +29,14 @@ env:
 jobs:
   cocoapods:
     name: cocoapods - ${{ matrix.os }}
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         os: [iOS, catalyst, tvOS, macOS]
         xcode: ["15.3"]
         include:
           - os: iOS
-            device: iPhone 14
+            device: iPhone 16
           - os: catalyst
             device: localhost
           - os: tvOS
diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml
index ec70891eb..2a43a46a6 100644
--- a/.github/workflows/authentication.yml
+++ b/.github/workflows/authentication.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: false
     steps:
       - name: Checkout
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 0f6b57019..6eade4f9a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   check:
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       MINT_PATH: ${{ github.workspace }}/mint
     steps:
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 24777e741..f14ee86d5 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -29,7 +29,7 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
@@ -46,9 +46,9 @@ jobs:
           gem install xcpretty
           bundle exec pod install --repo-update
           ../scripts/install_prereqs/config.sh
-          xcrun simctl boot "iPhone 14"
+          xcrun simctl boot "iPhone 16"
       - name: Build Swift
         run: ./scripts/test.sh
         env:
           OS: iOS
-          DEVICE: iPhone 14
+          DEVICE: iPhone 16
diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml
index 4567326c8..67422d86d 100644
--- a/.github/workflows/crashlytics.yml
+++ b/.github/workflows/crashlytics.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: true
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: true
     steps:
       - name: Checkout
@@ -54,14 +54,14 @@ jobs:
           SWIFT_SUFFIX: Swift
   spm:
     name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["15.3"]
         os: [iOS, tvOS, macOS, watchOS]
         include:
           - os: iOS
-            device: iPhone 14
+            device: iPhone 16
             test: false # flaky
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 54c564bd9..37cedff35 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: false
     steps:
       - name: Checkout
@@ -53,14 +53,14 @@ jobs:
           SWIFT_SUFFIX: Swift
   spm:
     name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["15.3"]
         os: [iOS, tvOS, macOS]
         include:
           - os: iOS
-            device: iPhone 14
+            device: iPhone 16
             test: false
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
diff --git a/.github/workflows/dynamiclinks.yml b/.github/workflows/dynamiclinks.yml
index 706b7f97b..853c714f4 100644
--- a/.github/workflows/dynamiclinks.yml
+++ b/.github/workflows/dynamiclinks.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: true
     steps:
       - name: Checkout
diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index 4e4ba683c..9ab5536d3 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: false
     steps:
       - name: Checkout
diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
index 026918edd..55c3ad84d 100644
--- a/.github/workflows/functions.yml
+++ b/.github/workflows/functions.yml
@@ -29,14 +29,14 @@ env:
 jobs:
   spm:
     name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["15.3"]
         os: [iOS, tvOS, macOS]
         include:
           - os: iOS
-            device: iPhone 14
+            device: iPhone 16
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
           - os: macOS
diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml
index 105328e3a..cf824f9c0 100644
--- a/.github/workflows/inappmessaging.yml
+++ b/.github/workflows/inappmessaging.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: true
     steps:
       - name: Checkout
diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml
index 38ecd645e..37f281558 100644
--- a/.github/workflows/installations.yml
+++ b/.github/workflows/installations.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: true
     steps:
       - name: Checkout
diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
index fa39939d8..0186e8858 100644
--- a/.github/workflows/messaging.yml
+++ b/.github/workflows/messaging.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: false
     steps:
       - name: Checkout
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index bff089fb8..cbf8b8347 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -33,12 +33,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: false
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: true
     steps:
       - name: Checkout
@@ -57,14 +57,14 @@ jobs:
           SWIFT_SUFFIX: Swift
   spm:
     name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["15.3"]
         os: [iOS, tvOS]
         include:
           - os: iOS
-            device: iPhone 14
+            device: iPhone 16
             test: false
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 5ede7379c..54f907c8f 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -29,12 +29,12 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-14
+    runs-on: macOS-15
     env:
       SPM: false
       LEGACY: true
       OS: iOS
-      DEVICE: iPhone 14
+      DEVICE: iPhone 16
       TEST: true
     steps:
       - name: Checkout
@@ -55,14 +55,14 @@ jobs:
 
   spm:
     name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
-    runs-on: macOS-14
+    runs-on: macOS-15
     strategy:
       matrix:
         xcode: ["15.3"]
         os: [iOS, tvOS, macOS]
         include:
           - os: iOS
-            device: iPhone 14
+            device: iPhone 16
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
           - os: macOS
diff --git a/scripts/framework_test.sh b/scripts/framework_test.sh
index 07d3de0ea..e155504fc 100755
--- a/scripts/framework_test.sh
+++ b/scripts/framework_test.sh
@@ -38,7 +38,7 @@ if [[ "$have_secrets" == true ]]; then
     xcodebuild \
     -project ${SAMPLE}Example.xcodeproj \
     -scheme  ${SAMPLE}Example${SWIFT_SUFFIX} \
-    -destination 'platform=iOS Simulator,name=iPhone 14 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
+    -destination 'platform=iOS Simulator,name=iPhone 16 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
     build \
     test \
     ) || EXIT_STATUS=$?
@@ -48,7 +48,7 @@ else
     xcodebuild \
     -project ${SAMPLE}Example.xcodeproj \
     -scheme  ${SAMPLE}Example${SWIFT_SUFFIX} \
-    -destination 'platform=iOS Simulator,name=iPhone 14 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
+    -destination 'platform=iOS Simulator,name=iPhone 16 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
     build
     ) || EXIT_STATUS=$?
 fi
diff --git a/scripts/test.sh b/scripts/test.sh
index 220ddc2e7..70098afd9 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -31,7 +31,7 @@ if [[ -z "${SPM:-}" ]]; then
 fi
 if [[ -z "${OS:-}" ]]; then
     OS=iOS
-    DEVICE="iPhone 14"
+    DEVICE="iPhone 16"
     echo "Defaulting to OS=$OS"
     echo "Defaulting to DEVICE=$DEVICE"
 fi