Skip to content

Commit 8c0d4ca

Browse files
authored
[Infra] Move 'core' workflow to Xcode 16 (#14688)
1 parent bc1e53e commit 8c0d4ca

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.github/workflows/core.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
target: [ios, tvos, macos --skip-tests, watchos]
2626
build-env:
2727
- os: macos-14
28-
xcode: Xcode_15.2
28+
xcode: Xcode_16.2
2929
- os: macos-15
3030
xcode: Xcode_16.2
3131
runs-on: ${{ matrix.build-env.os }}
@@ -47,6 +47,8 @@ jobs:
4747
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
4848
steps:
4949
- uses: actions/checkout@v4
50+
- name: Xcode
51+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
5052
- name: Generate Swift Package.resolved
5153
id: swift_package_resolve
5254
run: |
@@ -69,11 +71,8 @@ jobs:
6971
strategy:
7072
matrix:
7173
include:
72-
- os: macos-13
73-
xcode: Xcode_15.2
74-
target: iOS
7574
- os: macos-14
76-
xcode: Xcode_15.4
75+
xcode: Xcode_16.2
7776
target: iOS
7877
- os: macos-15
7978
xcode: Xcode_16.2
@@ -132,7 +131,7 @@ jobs:
132131
# Don't run on private repo.
133132
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
134133

135-
runs-on: macos-13
134+
runs-on: macos-14
136135
strategy:
137136
matrix:
138137
target: [ios, tvos, macos]
@@ -143,6 +142,8 @@ jobs:
143142
steps:
144143
- uses: actions/checkout@v4
145144
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
145+
- name: Xcode
146+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
146147
- name: Setup Bundler
147148
run: scripts/setup_bundler.sh
148149
- name: PodLibLint Core Cron

.github/workflows/core_extension.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
target: [ios, tvos, macos, watchos]
2424
build-env:
2525
- os: macos-14
26-
xcode: Xcode_15.2
26+
xcode: Xcode_16.2
2727
- os: macos-15
2828
xcode: Xcode_16.2
2929
runs-on: ${{ matrix.build-env.os }}
@@ -51,6 +51,8 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@v4
5353
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
54+
- name: Xcode
55+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
5456
- name: Setup Bundler
5557
run: scripts/setup_bundler.sh
5658
- name: PodLibLint CoreInternal Cron

.github/workflows/core_internal.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
target: [ios, tvos, macos, watchos]
2222
build-env:
2323
- os: macos-14
24-
xcode: Xcode_15.2
24+
xcode: Xcode_16.2
2525
swift_version: 5.9
2626
- os: macos-15
2727
xcode: Xcode_16.2
@@ -50,6 +50,8 @@ jobs:
5050
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
5151
steps:
5252
- uses: actions/checkout@v4
53+
- name: Xcode
54+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
5355
- name: Generate Swift Package.resolved
5456
id: swift_package_resolve
5557
run: |
@@ -72,11 +74,8 @@ jobs:
7274
strategy:
7375
matrix:
7476
include:
75-
- os: macos-13
76-
xcode: Xcode_15.2
77-
target: iOS
7877
- os: macos-14
79-
xcode: Xcode_15.4
78+
xcode: Xcode_16.2
8079
target: iOS
8180
- os: macos-15
8281
xcode: Xcode_16.2
@@ -135,7 +134,7 @@ jobs:
135134
core-internal-cron-only:
136135
# Don't run on private repo.
137136
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
138-
runs-on: macos-14
137+
runs-on: macos-15
139138
strategy:
140139
matrix:
141140
target: [ios, tvos, macos]
@@ -146,6 +145,8 @@ jobs:
146145
steps:
147146
- uses: actions/checkout@v4
148147
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
148+
- name: Xcode
149+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
149150
- name: Setup Bundler
150151
run: scripts/setup_bundler.sh
151152
- name: PodLibLint CoreInternal Cron

FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import Foundation
1616

1717
#if SWIFT_PACKAGE
18-
@_implementationOnly import GoogleUtilities_NSData
18+
internal import GoogleUtilities_NSData
1919
#else
20-
@_implementationOnly import GoogleUtilities
20+
internal import GoogleUtilities
2121
#endif // SWIFT_PACKAGE
2222

2323
/// A type that provides a string representation for use in an HTTP header.

0 commit comments

Comments
 (0)