Skip to content

Commit 8d70824

Browse files
morganchen12morganchen12
committed
Move to Swift 6 and Xcode 16+
1 parent b2ef5d9 commit 8d70824

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+63
-206
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ jobs:
2323
strategy:
2424
matrix:
2525
include:
26-
- os: macos-13
27-
xcode: Xcode_15.2
28-
target: ios
29-
- os: macos-14
30-
xcode: Xcode_15.4
31-
target: ios
3226
- os: macos-15
3327
xcode: Xcode_16.2
3428
target: ios
@@ -87,12 +81,6 @@ jobs:
8781
strategy:
8882
matrix:
8983
include:
90-
- os: macos-13
91-
xcode: Xcode_15.2
92-
target: iOS
93-
- os: macos-14
94-
xcode: Xcode_15.4
95-
target: iOS
9684
- os: macos-15
9785
xcode: Xcode_16.2
9886
target: iOS

‎.github/workflows/analytics.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ jobs:
2323
strategy:
2424
matrix:
2525
target: [ios, tvos, macos]
26-
os: [macos-14, macos-13]
26+
os: [macos-15]
2727
include:
28-
- os: macos-14
29-
xcode: Xcode_15.3
30-
- os: macos-13
31-
xcode: Xcode_15.2
28+
- os: macos-15
29+
xcode: Xcode_16.2
3230
runs-on: ${{ matrix.os }}
3331

3432
steps:

‎.github/workflows/auth.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
3131
target: [ios, tvos, macos --skip-tests, watchos]
3232
os: [macos-14]
33-
xcode: [Xcode_15.2]
33+
xcode: [Xcode_16.2]
3434
runs-on: ${{ matrix.os }}
3535
steps:
3636
- uses: actions/checkout@v4

‎.github/workflows/client_app.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
jobs:
2626
client-app-spm:
2727
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
28-
runs-on: macos-14
28+
runs-on: macos-15
2929
strategy:
3030
matrix:
3131
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
cache_key: ${{ matrix.os }}
3939
- name: Xcode
40-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
40+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
4141
- name: Build Client App –– ${{ matrix.platform }}
4242
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
4343

@@ -46,7 +46,7 @@ jobs:
4646
env:
4747
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
4848
FIREBASE_SOURCE_FIRESTORE: 1
49-
runs-on: macos-14
49+
runs-on: macos-15
5050
strategy:
5151
matrix:
5252
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -58,14 +58,14 @@ jobs:
5858
with:
5959
cache_key: ${{ matrix.os }}
6060
- name: Xcode
61-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
61+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
6262
- name: Build Client App –– ${{ matrix.platform }}
6363
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
6464

6565
client-app-cocoapods:
6666
# Don't run on private repo unless it is a PR.
6767
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
68-
runs-on: macos-14
68+
runs-on: macos-15
6969
strategy:
7070
matrix:
7171
scheme: [ClientApp-CocoaPods]
@@ -78,7 +78,7 @@ jobs:
7878
- name: Setup Bundler
7979
run: scripts/setup_bundler.sh
8080
- name: Xcode
81-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
81+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
8282
- name: Prereqs
8383
run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
8484
- name: Build

‎.github/workflows/core.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
2424
target: [ios, tvos, macos --skip-tests, watchos]
2525
build-env:
26-
- os: macos-14
27-
xcode: Xcode_15.2
2826
- os: macos-15
2927
xcode: Xcode_16.2
3028
runs-on: ${{ matrix.build-env.os }}
@@ -68,12 +66,6 @@ jobs:
6866
strategy:
6967
matrix:
7068
include:
71-
- os: macos-13
72-
xcode: Xcode_15.2
73-
target: iOS
74-
- os: macos-14
75-
xcode: Xcode_15.4
76-
target: iOS
7769
- os: macos-15
7870
xcode: Xcode_16.2
7971
target: iOS

‎.github/workflows/core_extension.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
matrix:
2222
target: [ios, tvos, macos, watchos]
2323
build-env:
24-
- os: macos-14
25-
xcode: Xcode_15.2
2624
- os: macos-15
2725
xcode: Xcode_16.2
2826
runs-on: ${{ matrix.build-env.os }}

‎.github/workflows/core_internal.yml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ jobs:
1919
matrix:
2020
target: [ios, tvos, macos, watchos]
2121
build-env:
22-
- os: macos-14
23-
xcode: Xcode_15.2
24-
swift_version: 5.9
25-
- os: macos-15
26-
xcode: Xcode_16.2
27-
swift_version: 5.9
2822
- os: macos-15
2923
xcode: Xcode_16.2
3024
swift_version: 6.0
@@ -37,7 +31,7 @@ jobs:
3731
- name: Xcode
3832
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3933
- name: Set Swift swift_version
40-
run: sed -i "" "s/s.swift_version[[:space:]]*=[[:space:]]*'5.9'/s.swift_version = '${{ matrix.build-env.swift_version }}'/" FirebaseCoreInternal.podspec
34+
run: sed -i "" "s/s.swift_version[[:space:]]*=[[:space:]]*'6.0'/s.swift_version = '${{ matrix.build-env.swift_version }}'/" FirebaseCoreInternal.podspec
4135
- name: Build and test
4236
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }}
4337

@@ -71,12 +65,6 @@ jobs:
7165
strategy:
7266
matrix:
7367
include:
74-
- os: macos-13
75-
xcode: Xcode_15.2
76-
target: iOS
77-
- os: macos-14
78-
xcode: Xcode_15.4
79-
target: iOS
8068
- os: macos-15
8169
xcode: Xcode_16.2
8270
target: iOS

‎.github/workflows/crashlytics.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ jobs:
3030
''
3131
]
3232
build-env:
33-
- os: macos-14
34-
xcode: Xcode_15.2
35-
tests: --skip-tests
3633
- os: macos-15
3734
xcode: Xcode_16.2
3835
tests: ""
@@ -83,12 +80,6 @@ jobs:
8380
strategy:
8481
matrix:
8582
include:
86-
- os: macos-13
87-
xcode: Xcode_15.2
88-
target: iOS
89-
- os: macos-14
90-
xcode: Xcode_15.4
91-
target: iOS
9283
- os: macos-15
9384
xcode: Xcode_16.2
9485
target: iOS

‎.github/workflows/database.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
matrix:
2828
target: [ios, tvos, macos --skip-tests, watchos]
2929
build-env:
30-
- os: macos-14
31-
xcode: Xcode_15.2
3230
- os: macos-15
3331
xcode: Xcode_16.2
3432
runs-on: ${{ matrix.build-env.os }}
@@ -45,7 +43,7 @@ jobs:
4543
integration:
4644
# Don't run on private repo unless it is a PR.
4745
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
48-
runs-on: macos-14
46+
runs-on: macos-15
4947
steps:
5048
- uses: actions/checkout@v4
5149
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -57,7 +55,7 @@ jobs:
5755
- name: Install xcpretty
5856
run: gem install xcpretty
5957
- name: Xcode
60-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
58+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
6159
- name: IntegrationTest
6260
# Only iOS to mitigate flakes.
6361
run: scripts/third_party/travis/retry.sh scripts/build.sh Database iOS integration
@@ -92,12 +90,6 @@ jobs:
9290
strategy:
9391
matrix:
9492
include:
95-
- os: macos-13
96-
xcode: Xcode_15.2
97-
target: iOS
98-
- os: macos-14
99-
xcode: Xcode_15.4
100-
target: iOS
10193
- os: macos-15
10294
xcode: Xcode_16.2
10395
target: iOS

‎.github/workflows/dynamiclinks.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
strategy:
2424
matrix:
2525
include:
26-
- os: macos-14
27-
xcode: Xcode_15.2
2826
- os: macos-15
2927
xcode: Xcode_16.2
3028
runs-on: ${{ matrix.os }}
@@ -68,10 +66,6 @@ jobs:
6866
strategy:
6967
matrix:
7068
include:
71-
- os: macos-13
72-
xcode: Xcode_15.2
73-
- os: macos-14
74-
xcode: Xcode_15.4
7569
- os: macos-15
7670
xcode: Xcode_16.2
7771
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)