Skip to content

Commit 3eca6be

Browse files
authored
[Infra] Move 'firestore' workflow to Xcode 16 (#14701)
1 parent 56301dd commit 3eca6be

File tree

2 files changed

+13
-20
lines changed

2 files changed

+13
-20
lines changed

.github/workflows/firestore.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ jobs:
333333
if: |
334334
(github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
335335
(github.event_name == 'pull_request')
336-
runs-on: macos-14
336+
runs-on: macos-15
337337

338338
strategy:
339339
matrix:
@@ -362,7 +362,7 @@ jobs:
362362
if: |
363363
(github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
364364
(github.event_name == 'pull_request')
365-
runs-on: macos-14
365+
runs-on: macos-15
366366
strategy:
367367
matrix:
368368
podspec: [
@@ -377,7 +377,7 @@ jobs:
377377
- name: Setup Bundler
378378
run: ./scripts/setup_bundler.sh
379379
- name: Xcode
380-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
380+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
381381

382382
- name: Pod lib lint
383383
# TODO(#9565, b/227461966): Remove --no-analyze when absl is fixed.
@@ -406,19 +406,11 @@ jobs:
406406
'--use-static-frameworks',
407407
'',
408408
]
409-
os: [macos-14, macos-13]
410-
# TODO: grpc and its dependencies don't build on Xcode 15 for macos because their minimum macos is lower than 10.11.
411-
exclude:
412-
- os: macos-13
413-
platforms: 'macos'
409+
os: [macos-15, macos-14]
414410
# Skip matrix cells covered by pod-lib-lint job.
415-
- os: macos-13
416-
platforms: 'ios'
417-
include:
411+
exclude:
418412
- os: macos-15
419-
xcode: Xcode_16.2
420-
- os: macos-13
421-
xcode: Xcode_15.2
413+
platforms: 'ios'
422414
runs-on: ${{ matrix.os }}
423415

424416
steps:
@@ -448,6 +440,8 @@ jobs:
448440
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
449441
steps:
450442
- uses: actions/checkout@v4
443+
- name: Xcode
444+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
451445
- name: Generate Swift Package.resolved
452446
id: swift_package_resolve
453447
run: |
@@ -472,11 +466,8 @@ jobs:
472466
strategy:
473467
matrix:
474468
include:
475-
- os: macos-13
476-
xcode: Xcode_15.2
477-
target: iOS
478469
- os: macos-14
479-
xcode: Xcode_15.4
470+
xcode: Xcode_16.2
480471
target: iOS
481472
- os: macos-15
482473
xcode: Xcode_16.2
@@ -514,12 +505,14 @@ jobs:
514505
if: |
515506
(github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
516507
(github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
517-
runs-on: macos-14
508+
runs-on: macos-15
518509
steps:
519510
- uses: actions/checkout@v4
520511
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
521512
with:
522513
cache_key: spm-binary
514+
- name: Xcode
515+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
523516
- name: Initialize xcodebuild
524517
run: scripts/setup_spm_tests.sh
525518
- name: iOS Build Test

Firestore/Swift/Source/Codable/DocumentID.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@_exported import FirebaseFirestoreInternal
2121
#endif // SWIFT_PACKAGE
2222

23-
@_implementationOnly import FirebaseCoreExtension
23+
internal import FirebaseCoreExtension
2424
import FirebaseSharedSwift
2525

2626
extension CodingUserInfoKey {

0 commit comments

Comments
 (0)