Merge e6d65a3 into a58216a

firebase · Apr 12, 2024 · 7a3d30f · 7a3d30f
2 parents a58216a + e6d65a3
commit 7a3d30f
Show file tree

Hide file tree

Showing 57 changed files with 358 additions and 375 deletions.
diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml
@@ -24,10 +24,10 @@ jobs:
       matrix:
         # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
         target: [ios, tvos, macos --skip-tests, watchos]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
@@ -52,10 +52,10 @@ jobs:
     strategy:
       matrix:
         target: [iOS, tvOS, macOS, catalyst, watchOS]
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
           - os: macos-14
@@ -85,7 +85,7 @@ jobs:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
 
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -109,7 +109,7 @@ jobs:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
@@ -132,7 +132,7 @@ jobs:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
@@ -161,7 +161,7 @@ jobs:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
 
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         target: [ios, tvos, macos]

diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml
@@ -23,10 +23,10 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/appdistribution.yml b/.github/workflows/appdistribution.yml
@@ -22,10 +22,10 @@ jobs:
     strategy:
       matrix:
         target: [ios]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
@@ -47,10 +47,10 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
@@ -70,7 +70,7 @@ jobs:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
 
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -85,7 +85,7 @@ jobs:
   appdistribution-cron-only:
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
 
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         target: [ios]

diff --git a/.github/workflows/archiving.yml b/.github/workflows/archiving.yml
@@ -19,7 +19,7 @@ jobs:
     # Don't run on private repo.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
 
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         # These need to be on a single line or else the formatting won't validate.
@@ -41,7 +41,7 @@ jobs:
     # Don't run on private repo.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
 
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         target: [ios, tvos, macos]

diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -26,10 +26,10 @@ jobs:
         podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
         # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
         target: [ios, tvos, macos --skip-tests, watchos]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
             tests: --skip-tests
           - os: macos-13
             xcode: Xcode_15.2
@@ -101,19 +101,16 @@ jobs:
     strategy:
       matrix:
         target: [iOS, tvOS, macOS, catalyst, watchOS]
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
-            test: spm
           - os: macos-13
             xcode: Xcode_15.2
             test: spmbuildonly
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_15.3
             test: spmbuildonly
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_15.3
             target: visionOS
             test: spm
     runs-on: ${{ matrix.os }}
@@ -137,7 +134,7 @@ jobs:
   catalyst:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -161,7 +158,7 @@ jobs:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
@@ -181,7 +178,7 @@ jobs:
   #   env:
   #     plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
   #     signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-  #   runs-on: macos-12
+  #   runs-on: macos-14
   #   steps:
   #   - uses: actions/checkout@v4
   #   - uses: ruby/setup-ruby@v1
@@ -203,7 +200,7 @@ jobs:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
 
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         # The macos and tvos tests can hang, and watchOS doesn't have tests.

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -15,7 +15,7 @@ jobs:
   check:
     # Don't run on private repo.
     if: github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
+    runs-on: macos-14
     env:
       MINT_PATH: ${{ github.workspace }}/mint
     steps:

diff --git a/.github/workflows/client_app.yml b/.github/workflows/client_app.yml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
   client-app-spm:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -44,7 +44,7 @@ jobs:
       env:
         FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
         FIREBASE_SOURCE_FIRESTORE: 1
-      runs-on: macos-12
+      runs-on: macos-14
       strategy:
         matrix:
           #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -61,7 +61,7 @@ jobs:
   client-app-cocoapods:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         scheme: [ClientApp-CocoaPods, ClientApp-CocoaPods-iOS13]

diff --git a/.github/workflows/cocoapods-integration.yml b/.github/workflows/cocoapods-integration.yml
@@ -19,7 +19,7 @@ jobs:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
 
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

diff --git a/.github/workflows/combine.yml b/.github/workflows/combine.yml
@@ -48,7 +48,7 @@ jobs:
   xcodebuild:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -76,7 +76,7 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -22,10 +22,10 @@ jobs:
       matrix:
         # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
         target: [ios, tvos, macos --skip-tests, watchos]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
@@ -45,16 +45,14 @@ jobs:
     strategy:
       matrix:
         target: [iOS, tvOS, macOS, catalyst, watchOS]
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
           - os: macos-13
             xcode: Xcode_15.2
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_15.3
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_15.3
             target: visionOS
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/core_extension.yml b/.github/workflows/core_extension.yml
@@ -20,10 +20,10 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
@@ -40,7 +40,7 @@ jobs:
   core-internal-cron-only:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         target: [ios, tvos, macos]

diff --git a/.github/workflows/core_internal.yml b/.github/workflows/core_internal.yml
@@ -18,10 +18,10 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        os: [macos-12, macos-13]
+        os: [macos-14, macos-13]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
+          - os: macos-14
+            xcode: Xcode_15.3
           - os: macos-13
             xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
@@ -41,16 +41,14 @@ jobs:
     strategy:
       matrix:
         target: [iOS, tvOS, macOS, catalyst, watchOS]
-        os: [macos-12, macos-13, macos-14]
+        os: [macos-13, macos-14]
         include:
-          - os: macos-12
-            xcode: Xcode_14.2
           - os: macos-13
             xcode: Xcode_15.2
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_15.3
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_15.3
             target: visionOS
     runs-on: ${{ matrix.os }}
     steps:
@@ -65,7 +63,7 @@ jobs:
   catalyst:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -82,7 +80,7 @@ jobs:
   core-internal-cron-only:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         target: [ios, tvos, macos]