From e2f6ec1dc559b707d5fe106583bd044438cee39e Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Thu, 11 Apr 2024 15:47:30 -0700
Subject: [PATCH] fixes and disable logging

---
 .github/workflows/inappmessaging.yml                |  3 ++-
 FirebaseCoreInternal.podspec                        |  4 ++--
 .../Base.lproj/Main.storyboard                      |  2 +-
 .../InAppMessagingDisplayModalViewUITests.swift     |  2 +-
 .../InAppMessaging_Example_iOS_SwiftUITests.swift   |  2 +-
 SymbolCollisionTest/Podfile                         | 13 -------------
 scripts/build.sh                                    |  4 ----
 7 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml
index 17bdac76d8a..ba947439278 100644
--- a/.github/workflows/inappmessaging.yml
+++ b/.github/workflows/inappmessaging.yml
@@ -45,7 +45,8 @@ 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-14
+# TODO: Update to macos-14 when tests are updated for Xcode 15.
+    runs-on: macos-12
     strategy:
       matrix:
 # TODO(#8682): Reenable iPad after fixing Xcode 13 test failures.
diff --git a/FirebaseCoreInternal.podspec b/FirebaseCoreInternal.podspec
index b93f75d680e..2cb42104375 100644
--- a/FirebaseCoreInternal.podspec
+++ b/FirebaseCoreInternal.podspec
@@ -43,9 +43,9 @@ Pod::Spec.new do |s|
   s.test_spec 'Unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }
     unit_tests.platforms = {
-      :ios => ios_deployment_target,
+      :ios => '13.0',
       :osx => '10.15',
-      :tvos => tvos_deployment_target
+      :tvos => '13.0'
     }
     unit_tests.source_files = [
       'FirebaseCore/Internal/Tests/Unit/**/*.swift',
diff --git a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/FiamDisplaySwiftExample/Base.lproj/Main.storyboard b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/FiamDisplaySwiftExample/Base.lproj/Main.storyboard
index 0c3d89c71d5..27330d75073 100644
--- a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/FiamDisplaySwiftExample/Base.lproj/Main.storyboard
+++ b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/FiamDisplaySwiftExample/Base.lproj/Main.storyboard
@@ -148,7 +148,7 @@
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2z0-64-rZk">
                                         <rect key="frame" x="0.0" y="222.33333333333334" width="414" height="55.666666666666657"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                        <state key="normal" title="Wthout Image or Action Button"/>
+                                        <state key="normal" title="Without Image or Action Button"/>
                                         <connections>
                                             <action selector="showWithoutImageAndButton:" destination="ttC-lg-4V1" eventType="touchUpInside" id="Sob-M5-UjN"/>
                                         </connections>
diff --git a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/InAppMessagingDisplay-UITests/InAppMessagingDisplayModalViewUITests.swift b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/InAppMessagingDisplay-UITests/InAppMessagingDisplayModalViewUITests.swift
index be3eec6d602..3d84a7b3108 100644
--- a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/InAppMessagingDisplay-UITests/InAppMessagingDisplayModalViewUITests.swift
+++ b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/InAppMessagingDisplay-UITests/InAppMessagingDisplayModalViewUITests.swift
@@ -187,7 +187,7 @@ class InAppMessagingDisplayModalViewUITests: InAppMessagingDisplayUITestsBase {
     let orientantions = [UIDeviceOrientation.portrait, UIDeviceOrientation.landscapeLeft]
     for orientation in orientantions {
       XCUIDevice.shared.orientation = orientation
-      app.buttons["Wthout Image or Action Button"].tap()
+      app.buttons["Without Image or Action Button"].tap()
 
       waitForElementToAppear(closeButton)
 
diff --git a/FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/InAppMessaging_Example_iOS_SwiftUITests/InAppMessaging_Example_iOS_SwiftUITests.swift b/FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/InAppMessaging_Example_iOS_SwiftUITests/InAppMessaging_Example_iOS_SwiftUITests.swift
index 8669aa069ac..79ffa76b122 100644
--- a/FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/InAppMessaging_Example_iOS_SwiftUITests/InAppMessaging_Example_iOS_SwiftUITests.swift
+++ b/FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/InAppMessaging_Example_iOS_SwiftUITests/InAppMessaging_Example_iOS_SwiftUITests.swift
@@ -452,7 +452,7 @@ class InAppMessaging_Example_iOS_SwiftUITests: XCTestCase {
     let orientantions = [UIDeviceOrientation.portrait, UIDeviceOrientation.landscapeLeft]
     for orientation in orientantions {
       XCUIDevice.shared.orientation = orientation
-      app.buttons["Wthout Image or Action Button"].tap()
+      app.buttons["Without Image or Action Button"].tap()
 
       waitForElementToAppear(closeButton)
 
diff --git a/SymbolCollisionTest/Podfile b/SymbolCollisionTest/Podfile
index 02f47ed299f..e504869155a 100644
--- a/SymbolCollisionTest/Podfile
+++ b/SymbolCollisionTest/Podfile
@@ -40,30 +40,18 @@ target 'SymbolCollisionTest' do
   # Other Google Pods
     pod 'ARCore'
 #    pod 'Blockly'  `Blockly` does not specify a Swift version ...
-#    pod 'DigitsMigrationHelper' Dependency Base64 doesn't build in Xcode 15
     pod 'EarlGrey'
 #    pod 'GeoFire' -- requires Firebase/Database 4.0
 #    pod 'google-cast-sdk' -- abseil
     pod 'Google-Mobile-Ads-SDK'
     pod 'GoogleAnalytics'
-#    pod 'GoogleAppIndexing' Fails to build with Xcode 15
-    pod 'GoogleAppUtilities'
-    pod 'GoogleAuthUtilities'
-#    pod 'GoogleConversionTracking' Fails to build with Xcode 15
-    pod 'GoogleDataTransport'
-#     pod 'GoogleIDFASupport' Fails to build with Xcode 15
-    pod 'GoogleInterchangeUtilities'
     pod 'GoogleMaps'
 
 #    pod 'GoogleMobileVision' # After Firebase 6.8.0, conflicts with FirebaseML
-    pod 'GoogleNetworkingUtilities'
-    pod 'GoogleParsingUtilities'
     pod 'GooglePlacePicker'
     pod 'GooglePlaces'
-    pod 'GooglePlusUtilities'
     pod 'GoogleSignIn', '> 6'
     pod 'GTMAppAuth'
-    pod 'GoogleSymbolUtilities'
     pod 'GoogleTagManager'
     pod 'GoogleToolboxForMac'
     pod 'GoogleUtilities'
@@ -71,7 +59,6 @@ target 'SymbolCollisionTest' do
     pod 'GTMSessionFetcher'
 #    pod 'GVRSDK' -- absl and protobuf duplicates
     pod 'leveldb-library'
-#    pod 'MDFTextAccessibility' - conflicts with GVRSDK
     pod 'nanopb'
 #    pod 'NearbyMessages' # - conflicts with google-cast-sdk
     pod 'Protobuf'
diff --git a/scripts/build.sh b/scripts/build.sh
index 8ec8490a7b0..f44d3d28a21 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,7 +24,6 @@ function pod_gen() {
 }
 
 set -euo pipefail
-set -x
 
 if [[ $# -lt 1 ]]; then
   cat 1>&2 <<EOF
@@ -95,11 +94,8 @@ system=$(uname -s)
 case "$system" in
   Darwin)
     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"