From 0cb1f67a04d70a80d827bb6cdfa4a55705681440 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Thu, 11 Apr 2024 13:38:10 -0700
Subject: [PATCH] style and more logging

---
 .github/workflows/database.yml                  | 9 ++-------
 .github/workflows/firestore.yml                 | 3 ++-
 .github/workflows/spectesting.yml               | 3 ++-
 .github/workflows/storage.yml                   | 2 +-
 FirebaseSessions/Sources/FirebaseSessions.swift | 1 +
 SymbolCollisionTest/Podfile                     | 2 +-
 scripts/build.sh                                | 5 ++++-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 406b04b1429..309c80ffbc0 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -89,13 +89,8 @@ jobs:
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Initialize xcodebuild
       run: scripts/setup_spm_tests.sh
-    - uses: nick-fields/retry@v3
-      with:
-        timeout_minutes: 120
-        max_attempts: 3
-        retry_on: error
-        retry_wait_seconds: 120
-        command: scripts/build.sh DatabaseUnit ${{ matrix.target }} spm
+    - name: Unit Tests
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnit ${{ matrix.target }} spm
     - name: iOS Swift Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnitSwift ${{ matrix.target }} spm
 
diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index 552d8917973..ff33f06db52 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -326,7 +326,8 @@ jobs:
     if: |
       (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
       (github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
-    runs-on: macos-14
+    # TODO: macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
+    runs-on: macos-12
     needs: check
 
     strategy:
diff --git a/.github/workflows/spectesting.yml b/.github/workflows/spectesting.yml
index 97cf1bb4dcb..52891d51ac8 100644
--- a/.github/workflows/spectesting.yml
+++ b/.github/workflows/spectesting.yml
@@ -44,7 +44,8 @@ jobs:
   specs_testing:
     needs: specs_checking
     if: ${{ needs.specs_checking.outputs.podspecs != '[]' }}
-    runs-on: macos-14
+    # TODO: macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
+    runs-on: macos-12
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.specs_checking.outputs.matrix)}}
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index b733ad370c2..a651334bb99 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -117,7 +117,7 @@ jobs:
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Test quickstart
-      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true ${{ matrix.swift }})
+      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage false ${{ matrix.swift }})
 
   quickstart-ftl-cron-only:
     # Don't run on private repo.
diff --git a/FirebaseSessions/Sources/FirebaseSessions.swift b/FirebaseSessions/Sources/FirebaseSessions.swift
index 452dbafd064..d04162acc5e 100644
--- a/FirebaseSessions/Sources/FirebaseSessions.swift
+++ b/FirebaseSessions/Sources/FirebaseSessions.swift
@@ -18,6 +18,7 @@ import Foundation
 @_implementationOnly import FirebaseCoreExtension
 @_implementationOnly import FirebaseInstallations
 @_implementationOnly import GoogleDataTransport
+
 #if swift(>=6.0)
   internal import Promises
 #elseif swift(>=5.10)
diff --git a/SymbolCollisionTest/Podfile b/SymbolCollisionTest/Podfile
index e21d21848d1..02f47ed299f 100644
--- a/SymbolCollisionTest/Podfile
+++ b/SymbolCollisionTest/Podfile
@@ -46,7 +46,7 @@ target 'SymbolCollisionTest' do
 #    pod 'google-cast-sdk' -- abseil
     pod 'Google-Mobile-Ads-SDK'
     pod 'GoogleAnalytics'
-    pod 'GoogleAppIndexing'
+#    pod 'GoogleAppIndexing' Fails to build with Xcode 15
     pod 'GoogleAppUtilities'
     pod 'GoogleAuthUtilities'
 #    pod 'GoogleConversionTracking' Fails to build with Xcode 15
diff --git a/scripts/build.sh b/scripts/build.sh
index 98d46fac571..8ec8490a7b0 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -94,9 +94,12 @@ database_emulator="${scripts_dir}/run_database_emulator.sh"
 system=$(uname -s)
 case "$system" in
   Darwin)
-    xcode_version=$(xcodebuild -version | head -n 1)
+    xcode_version=$(xcodebuild -version | grep Xcode)
+    echo $xcode_version
     xcode_version="${xcode_version/Xcode /}"
+    echo $xcode_version
     xcode_major="${xcode_version/.*/}"
+    echo $xcode_major
     ;;
   *)
     xcode_major="0"