Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to GMA 2024 major revision, Xcode 15, runners to macos-13 #1537

Merged
merged 65 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
dd646b2
Update GMA SDK to 11.0.1.
jonsimantov Feb 12, 2024
5df44f4
Change property names to match v11 GMA properties.
jonsimantov Feb 12, 2024
5d20ab9
Increase deployment target to iOS 12.
jonsimantov Feb 12, 2024
3d87b5b
Fix bools.
jonsimantov Feb 12, 2024
03feb33
Properly use NSNumber.
jonsimantov Feb 12, 2024
65fa9a2
Change adNetworkClassName to be referenced from the loadedAdNetworkRe…
jonsimantov Feb 13, 2024
d9036fc
Change iphone deployment target to 12.
jonsimantov Feb 13, 2024
8737013
Merge branch 'main' into gma-2024-ios
jonsimantov Feb 14, 2024
9f1c99e
Update Xcode version to 15.1.
jonsimantov Feb 15, 2024
a9d0f29
Use MacOS 13 runner for Xcode 15.1.
jonsimantov Feb 15, 2024
724f853
Use MacOS 13 runner for Xcode 15.1.
jonsimantov Feb 15, 2024
87e6680
Force Android build to use Java 8.
jonsimantov Feb 15, 2024
a7f057b
Remove trailing whitespace and add to Android workflow.
jonsimantov Feb 15, 2024
c3f8c12
Add quotes.
jonsimantov Feb 15, 2024
7b8e7c8
Merge branch 'update-macos-runners-to-13' into gma-2024-ios
jonsimantov Feb 15, 2024
c5208d0
Update simulator devices to xcode 15.1 compatible.
jonsimantov Feb 15, 2024
262ad14
Merge branch 'update-macos-runners-to-13' into gma-2024-ios
jonsimantov Feb 15, 2024
7739749
Increase Android test timeout.
jonsimantov Feb 15, 2024
a417079
Merge branch 'update-macos-runners-to-13' into gma-2024-ios
jonsimantov Feb 15, 2024
507bf51
Merge branch 'main' into gma-2024-ios
jonsimantov Feb 20, 2024
3fb44bc
Increase timeouts.
jonsimantov Feb 20, 2024
d058c90
Merge branch 'main' into update-macos-runners-to-13
jonsimantov Feb 20, 2024
7aae7dc
Remove bad device from Android list.
jonsimantov Mar 6, 2024
5cbdd5f
Merge branch 'main' into update-macos-runners-to-13
jonsimantov Mar 6, 2024
d78922a
Update the integration tests SWIFT_VERSION
a-maurice Mar 6, 2024
0f49bb7
Merge branch 'update-macos-runners-to-13' of https://github.com/fireb…
jonsimantov Mar 6, 2024
e0808bd
Merge branch 'main' into update-macos-runners-to-13
jonsimantov Mar 6, 2024
f634c7d
Fix tvOS deployment target in Xcode projects.
jonsimantov Mar 7, 2024
5b75cbe
Merge branch 'main' into gma-2024-ios
jonsimantov Mar 7, 2024
8e2ef10
Merge branch 'update-macos-runners-to-13' into gma-2024-ios
jonsimantov Mar 7, 2024
f9a61ff
Merge branch 'main' into update-macos-runners-to-13
jonsimantov Mar 7, 2024
4290b63
Merge branch 'main' into gma-2024-ios
jonsimantov Mar 7, 2024
ec93457
Set up default Xcode version.
jonsimantov Mar 7, 2024
fc35f1d
Merge branch 'main' into gma-2024-ios
jonsimantov Mar 7, 2024
0c4d189
Tweak simulator versions.
jonsimantov Mar 7, 2024
4749dfd
Merge branch 'gma-2024-ios' of https://github.com/firebase/firebase-c…
jonsimantov Mar 7, 2024
981be19
Merge branch 'update-macos-runners-to-13' into gma-2024-ios
jonsimantov Mar 7, 2024
4413caa
Only disable the warning on Mac.
jonsimantov Mar 7, 2024
364a2f3
Temporarily use branch for Firestore.
jonsimantov Mar 8, 2024
fd443bb
Use xcode-select to set Xcode version for iOS/tvOS as well.
jonsimantov Mar 8, 2024
d8b2d63
Also setup xcode version for test runners, in case needed for simulat…
jonsimantov Mar 8, 2024
6996666
Remove warning flag no longer needed.
jonsimantov Mar 8, 2024
467d0ab
Remove default Xcode on GitHub runner to avoid SDK conflicts.
jonsimantov Mar 8, 2024
1ff8591
Merge branch 'main' into gma-2024-ios
jonsimantov Mar 8, 2024
d7831b8
Use a commit hash rather than a branch for Firestore inclusion.
jonsimantov Mar 8, 2024
9530771
Add quotes around version since it starts with a digit.
jonsimantov Mar 8, 2024
4df0771
Merge branch 'gma-2024-ios' of https://github.com/firebase/firebase-c…
jonsimantov Mar 8, 2024
5861118
Set gameloop project to manual code sign mode.
jonsimantov Mar 8, 2024
4c22004
Turn off code signing for simulator builds as well.
jonsimantov Mar 8, 2024
47f003f
Revert "Set gameloop project to manual code sign mode."
jonsimantov Mar 8, 2024
3962fa7
Change simulator IDs to match the output of xcrun xctrace list devices.
jonsimantov Mar 8, 2024
1a0f2db
Move "Simulator" text to test_simulator script.
jonsimantov Mar 8, 2024
83cc51e
Fix iOS version for minimum simulator.
jonsimantov Mar 8, 2024
5fa3ac8
Only use the first line of the simulator getter command output.
jonsimantov Mar 9, 2024
948754e
Include code sign options in simulator test script as well.
jonsimantov Mar 9, 2024
c1b0986
Fix extraneous "Simulator" word.
jonsimantov Mar 9, 2024
581000f
Add test keychain for iOS simulator builds.
jonsimantov Mar 11, 2024
3621918
Merge branch 'main' into gma-2024-ios
jonsimantov Mar 11, 2024
b067597
Add code signing back in for simulator builds.
jonsimantov Mar 11, 2024
de6f03f
Merge branch 'gma-2024-ios' of https://github.com/firebase/firebase-c…
jonsimantov Mar 11, 2024
f58e4e6
Add expanded error printing for additional Auth iOS callbacks.
jonsimantov Mar 11, 2024
0cbcfc9
Merge branch 'main' into gma-2024-ios
jonsimantov Mar 11, 2024
f132e97
Revert changes to xcodebuild.py.
jonsimantov Mar 12, 2024
ef2ea06
Format code.
jonsimantov Mar 12, 2024
039c8ba
Add release note for GMA major release.
jonsimantov Mar 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ jobs:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer

- name: Force Java 8 (macOS)
if: startsWith(matrix.os, 'macos')
shell: bash
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
- name: Store git credentials for all git commands
# Forces all git commands to use authenticated https, to prevent throttling.
shell: bash
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/cpp-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ env:
demumbleVer: "df938e45c2b0e064fb5323d88b692d03b451d271"
# Use SHA256 for hashing files.
hashCommand: "sha256sum"
# Xcode version 14.1 is the version we build the SDK with.
# Xcode version 15.1 is the version we build the SDK with.
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
xcodeVersion: "14.1"
xcodeVersion: "15.1"
# LLVM version with ARM MachO support has no version number yet.
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
GITHUB_TOKEN: ${{ github.token }}
Expand Down Expand Up @@ -79,13 +79,13 @@ jobs:
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
strategy:
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-20.04, macos-13]
include:
- os: ubuntu-20.04
tools_platform: linux
# Binutils 2.35.1 released Sep 19, 2020
binutils_version: "2.35.1"
- os: macos-12
- os: macos-13
tools_platform: darwin
# Binutils 2.35.1 released Sep 19, 2020
binutils_version: "2.35.1"
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:

build_and_package_ios_tvos:
name: build-and-package-ios-tvos
runs-on: macos-12
runs-on: macos-13
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
steps:
- name: Store git credentials for all git commands
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-20.04, macos-12]
os: [windows-latest, ubuntu-20.04, macos-13]
build_type: ["Release", "Debug"]
architecture: ["x64", "x86", "arm64"]
msvc_runtime: ["static", "dynamic"]
Expand All @@ -325,21 +325,21 @@ jobs:
vcpkg_triplet_suffix: "linux"
additional_build_flags: ""
sdk_platform: "linux"
- os: macos-12
- os: macos-13
vcpkg_triplet_suffix: "osx"
additional_build_flags: "--target_format libraries"
sdk_platform: "darwin"

exclude:
- os: windows-latest
linux_abi: "c++11"
- os: macos-12
- os: macos-13
architecture: "x86"
- os: macos-12
- os: macos-13
msvc_runtime: "dynamic"
- os: macos-12
- os: macos-13
linux_abi: "c++11"
- os: macos-12
- os: macos-13
build_type: "Debug"
- os: ubuntu-20.04
msvc_runtime: "dynamic"
Expand Down Expand Up @@ -492,7 +492,7 @@ jobs:
suffix: '-x64-Debug-dynamic'
runs_on_platform: ubuntu-20.04
- sdk_platform: darwin
runs_on_platform: macos-12
runs_on_platform: macos-13
exclude:
- sdk_platform: windows
suffix: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ jobs:
# msvc_runtime excludes
- os: ubuntu-20.04
msvc_runtime: "dynamic"
- os: macos-12
- os: macos-13
msvc_runtime: "dynamic"
# architecture excluees
- os: macos-12
- os: macos-13
architecture: "x86"
# Xcode excludes -- allow only one on osx and linux
- os: ubuntu-20.04
Expand Down
Loading
Loading