From e516543e3fb1c2d1c17f3abb72c80f5175e859d0 Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Wed, 9 Apr 2025 16:20:43 -0400
Subject: [PATCH 1/2] [Infra] Move 'core' workflow to Xcode 16

---
 .github/workflows/core_internal.yml                 | 13 +++++++------
 .../HeartbeatLogging/HeartbeatsPayload.swift        |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/core_internal.yml b/.github/workflows/core_internal.yml
index 75bc6dd8fde..ea6b14117a4 100644
--- a/.github/workflows/core_internal.yml
+++ b/.github/workflows/core_internal.yml
@@ -20,7 +20,7 @@ jobs:
         target: [ios, tvos, macos, watchos]
         build-env:
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_16.2
             swift_version: 5.9
           - os: macos-15
             xcode: Xcode_16.2
@@ -49,6 +49,8 @@ jobs:
       cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
     steps:
       - uses: actions/checkout@v4
+      - name: Xcode
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
       - name: Generate Swift Package.resolved
         id: swift_package_resolve
         run: |
@@ -71,11 +73,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-            xcode: Xcode_15.2
-            target: iOS
           - os: macos-14
-            xcode: Xcode_15.4
+            xcode: Xcode_16.2
             target: iOS
           - os: macos-15
             xcode: Xcode_16.2
@@ -134,7 +133,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-14
+    runs-on: macos-15
     strategy:
       matrix:
         target: [ios, tvos, macos]
@@ -145,6 +144,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: PodLibLint CoreInternal Cron
diff --git a/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift
index 525b480f38d..16049333168 100644
--- a/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift
+++ b/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift
@@ -15,9 +15,9 @@
 import Foundation
 
 #if SWIFT_PACKAGE
-  @_implementationOnly import GoogleUtilities_NSData
+  internal import GoogleUtilities_NSData
 #else
-  @_implementationOnly import GoogleUtilities
+  internal import GoogleUtilities
 #endif // SWIFT_PACKAGE
 
 /// A type that provides a string representation for use in an HTTP header.

From ccbeaff35926feb3dc7e172c09354a1b9f996994 Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Wed, 9 Apr 2025 16:26:50 -0400
Subject: [PATCH 2/2] migrate core and coreextension

---
 .github/workflows/core.yml           | 13 +++++++------
 .github/workflows/core_extension.yml |  4 +++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 0776a179fd6..367e1d5546d 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -24,7 +24,7 @@ jobs:
         target: [ios, tvos, macos --skip-tests, watchos]
         build-env:
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_16.2
           - os: macos-15
             xcode: Xcode_16.2
     runs-on: ${{ matrix.build-env.os }}
@@ -46,6 +46,8 @@ jobs:
       cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
     steps:
       - uses: actions/checkout@v4
+      - name: Xcode
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
       - name: Generate Swift Package.resolved
         id: swift_package_resolve
         run: |
@@ -68,11 +70,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-            xcode: Xcode_15.2
-            target: iOS
           - os: macos-14
-            xcode: Xcode_15.4
+            xcode: Xcode_16.2
             target: iOS
           - os: macos-15
             xcode: Xcode_16.2
@@ -131,7 +130,7 @@ jobs:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
 
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
         target: [ios, tvos, macos]
@@ -142,6 +141,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: PodLibLint Core Cron
diff --git a/.github/workflows/core_extension.yml b/.github/workflows/core_extension.yml
index 91a00903f1c..e2eece44841 100644
--- a/.github/workflows/core_extension.yml
+++ b/.github/workflows/core_extension.yml
@@ -22,7 +22,7 @@ jobs:
         target: [ios, tvos, macos, watchos]
         build-env:
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_16.2
           - os: macos-15
             xcode: Xcode_16.2
     runs-on: ${{ matrix.build-env.os }}
@@ -50,6 +50,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: PodLibLint CoreInternal Cron