Skip to content

Commit ed2d720

Browse files
authored
Update Xcode version to 14.1. (#1291)
* Update Xcode version to 14.1. * Update iOS/tvOS simulator versions. * Update release notes with new Xcode version. * Consolidate readme lines. * Revert tvOS simulator version. * Update to tvOS simulator supported by GitHub.
1 parent 888e725 commit ed2d720

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
1515
GITHUB_TOKEN: ${{ github.token }}
16-
xcodeVersion: "13.3.1" # Only affects Mac runners, and only for prerequisites.
16+
xcodeVersion: "14.1" # Only affects Mac runners, and only for prerequisites.
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}

.github/workflows/cpp-packaging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ env:
3232
demumbleVer: "df938e45c2b0e064fb5323d88b692d03b451d271"
3333
# Use SHA256 for hashing files.
3434
hashCommand: "sha256sum"
35-
# Xcode version 13.3.1 is the version we build the SDK with.
35+
# Xcode version 14.1 is the version we build the SDK with.
3636
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
37-
xcodeVersion: "13.3.1"
37+
xcodeVersion: "14.1"
3838
# LLVM version with ARM MachO support has no version number yet.
3939
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
4040
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/integration_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ env:
4747
triggerLabelFull: "tests-requested: full"
4848
triggerLabelQuick: "tests-requested: quick"
4949
pythonVersion: '3.7'
50-
xcodeVersion: '13.3.1'
50+
xcodeVersion: '14.1'
5151
artifactRetentionDays: 2
5252
GITHUB_TOKEN: ${{ github.token }}
5353
# All self-hosted ARM Mac runners should have this label. Due to how

release_build_files/readme.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ Firebase Installations (stub) | firebase_installations.framework
407407
Firebase Cloud Messaging (stub) | firebase_messaging.framework
408408
| | firebase.framework
409409

410-
The provided libraries have been tested using Xcode 13.3.1. When building C++
410+
The provided libraries have been tested using Xcode 14.1. When building C++
411411
desktop apps on OS X, you will need to link the `gssapi_krb5` and `pthread`
412412
system libraries, as well as the `CoreFoundation`, `Foundation`, `GSS`, and
413413
`Security` OS X system frameworks (consult your compiler documentation for more
@@ -606,13 +606,15 @@ code.
606606
### Upcoming Release
607607
- Changes
608608
- General: Update minimum supported C++ standard to C++14.
609-
- General (iOS): Update to Firebase Cocoapods version 10.8.0.
610609
- General (Android): Update to Firebase Android BoM version 31.5.0.
610+
- General (iOS): Update to Firebase Cocoapods version 10.8.0.
611+
- General (iOS, tvOS, Desktop): iOS, tvOS, and macOS SDKs are now built
612+
using Xcode 14.1.
611613
- AdMob: Removed deprecated AdMob SDK. Please use the included Google
612614
Mobile Ads SDK ("GMA") instead.
613615
- GMA (Android): Updated dependency to play-services-ads version 22.0.0.
614-
- Firestore: Added `Query::Count()`, which fetches the number of documents in the result
615-
set without actually downloading the documents
616+
- Firestore: Added `Query::Count()`, which fetches the number of documents
617+
in the result set without actually downloading the documents
616618
([#1207](https://github.com/firebase/firebase-cpp-sdk/pull/1207)).
617619

618620
### 10.7.0

scripts/gha/print_matrix_configuration.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@
7676
"build_type": ["Release", "Debug"],
7777
"architecture": ["x64", "x86", "arm64"],
7878
"msvc_runtime": ["static","dynamic"],
79-
"xcode_version": ["13.3.1"],
79+
"xcode_version": ["14.1"],
8080
"python_version": ["3.7"],
8181

8282
EXPANDED_KEY: {
8383
"os": ["ubuntu-20.04", "macos-12", "windows-latest"],
84-
"xcode_version": ["13.3.1"],
84+
"xcode_version": ["14.1"],
8585
}
8686
}
8787
},
@@ -112,7 +112,7 @@
112112
"msvc_runtime": ["dynamic"],
113113
"cpp_compiler_windows": ["VisualStudio2019"],
114114
"cpp_compiler_linux": ["clang-11.0"],
115-
"xcode_version": ["13.3.1"], # only the first one is used
115+
"xcode_version": ["14.1"], # only the first one is used
116116
"ndk_version": ["r22b"],
117117
"platform_version": ["28"],
118118
"build_tools_version": ["28.0.3"],
@@ -140,10 +140,10 @@
140140

141141
"ios": {
142142
"matrix": {
143-
"xcode_version": ["13.3.1"],
143+
"xcode_version": ["14.1"],
144144

145145
EXPANDED_KEY: {
146-
"xcode_version": ["13.3.1"]
146+
"xcode_version": ["14.1"]
147147
}
148148
}
149149
},
@@ -175,12 +175,12 @@
175175
"ios_min": {"type": "ftl", "device": "model=iphone8,version=14.7"},
176176
"ios_target": {"type": "ftl", "device": "model=iphone13pro,version=15.7"},
177177
"ios_latest": {"type": "ftl", "device": "model=iphone11pro,version=16.3"},
178-
"simulator_min": {"type": "virtual", "name":"iPhone 8", "version":"13.7"},
179-
"simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"14.5"},
180-
"simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"15.2"},
181-
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.3"},
178+
"simulator_min": {"type": "virtual", "name":"iPhone 8", "version":"15.2"},
179+
"simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"16.1"},
180+
"simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"16.3.1"},
181+
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"16.1"},
182182
}
183-
183+
184184

185185

186186
def get_value(workflow, test_matrix, parm_key, config_parms_only=False):

0 commit comments

Comments
 (0)