Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
env:
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
GITHUB_TOKEN: ${{ github.token }}
xcodeVersion: "26.2" # Only affects Mac runners, and only for prerequisites.
xcodeVersion: "26.4" # Only affects Mac runners, and only for prerequisites.

permissions:
contents: read
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- os: ubuntu-22.04
architecture: arm64
# Do not attempt to use x64 on Mac.
- os: macos-15
- os: macos-26
architecture: x64
steps:
- uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # ratchet:lukka/get-cmake@latest
Expand Down Expand Up @@ -123,26 +123,26 @@ jobs:
id: cache_ndk
uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # ratchet:actions/cache@v3
with:
path: /tmp/android-ndk-r21e
key: android-ndk-${{ matrix.os }}-r21e
path: /tmp/android-ndk-r23b
key: android-ndk-${{ matrix.os }}-r23b

- name: Check cached NDK
shell: bash
if: steps.cache_ndk.outputs.cache-hit != 'true'
run: |
# If the NDK failed to download from the cache, but there is a
# /tmp/android-ndk-r21e directory, it's incomplete, so remove it.
if [[ -d "/tmp/android-ndk-r21e" ]]; then
# /tmp/android-ndk-r23b directory, it's incomplete, so remove it.
if [[ -d "/tmp/android-ndk-r23b" ]]; then
echo "Removing incomplete download of NDK"
rm -rf /tmp/android-ndk-r21e
rm -rf /tmp/android-ndk-r23b
fi

- name: Install prerequisites
shell: bash
run: |
build_scripts/android/install_prereqs.sh
echo "NDK_ROOT=/tmp/android-ndk-r21e" >> $GITHUB_ENV
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV
echo "NDK_ROOT=/tmp/android-ndk-r23b" >> $GITHUB_ENV
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r23b" >> $GITHUB_ENV

- name: Add strings.exe to PATH (Windows only)
if: startsWith(matrix.os, 'windows')
Expand Down
28 changes: 14 additions & 14 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 26.2 is the version we build the SDK with.
# Xcode version 26.4 is the version we build the SDK with.
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
xcodeVersion: "26.2"
xcodeVersion: "26.4"
# LLVM version with ARM MachO support has no version number yet.
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
GITHUB_TOKEN: ${{ github.token }}
Expand Down Expand Up @@ -85,13 +85,13 @@ jobs:
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
strategy:
matrix:
os: [ubuntu-22.04, macos-15]
os: [ubuntu-22.04, macos-26]
include:
- os: ubuntu-22.04
tools_platform: linux
# Binutils 2.35.1 released Sep 19, 2020
binutils_version: "2.35.1"
- os: macos-15
- os: macos-26
tools_platform: darwin
# Binutils 2.35.1 released Sep 19, 2020
binutils_version: "2.35.1"
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:

build_and_package_ios_tvos:
name: build-and-package-ios-tvos
runs-on: macos-15
runs-on: macos-26
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
steps:
- uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # ratchet:lukka/get-cmake@latest
Expand Down Expand Up @@ -301,8 +301,8 @@ jobs:
id: cache_ndk
uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # ratchet:actions/cache@v3
with:
path: /tmp/android-ndk-r21e
key: android-ndk-${{ runner.os }}-r21e
path: /tmp/android-ndk-r23b
key: android-ndk-${{ runner.os }}-r23b

- name: install prerequisites
run: sdk-src/build_scripts/android/install_prereqs.sh
Expand Down Expand Up @@ -342,7 +342,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2022, ubuntu-22.04, macos-15]
os: [windows-2022, ubuntu-22.04, macos-26]
build_type: ["Release", "Debug"]
architecture: ["x64", "x86", "arm64"]
msvc_runtime: ["static", "dynamic"]
Expand All @@ -360,21 +360,21 @@ jobs:
vcpkg_triplet_suffix: "linux"
additional_build_flags: ""
sdk_platform: "linux"
- os: macos-15
- os: macos-26
vcpkg_triplet_suffix: "osx"
additional_build_flags: "--target_format libraries"
sdk_platform: "darwin"

exclude:
- os: windows-2022
linux_abi: "c++11"
- os: macos-15
- os: macos-26
architecture: "x86"
- os: macos-15
- os: macos-26
msvc_runtime: "dynamic"
- os: macos-15
- os: macos-26
linux_abi: "c++11"
- os: macos-15
- os: macos-26
build_type: "Debug"
- os: ubuntu-22.04
msvc_runtime: "dynamic"
Expand Down Expand Up @@ -532,7 +532,7 @@ jobs:
suffix: '-x64-Debug-dynamic'
runs_on_platform: ubuntu-22.04
- sdk_platform: darwin
runs_on_platform: macos-15
runs_on_platform: macos-26
exclude:
- sdk_platform: windows
suffix: ''
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ jobs:
# msvc_runtime excludes
- os: ubuntu-22.04
msvc_runtime: "dynamic"
- os: macos-15
- os: macos-26
msvc_runtime: "dynamic"
# architecture excluees
- os: macos-15
- os: macos-26
architecture: "x86"
- os: macos-15
- os: macos-26
architecture: "x64"
# Xcode excludes -- allow only one on osx and linux
- os: ubuntu-22.04
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
required: true
operating_systems:
description: 'CSV of VMs to run on'
default: 'ubuntu-22.04,windows-2022,macos-15'
default: 'ubuntu-22.04,windows-2022,macos-26'
required: true
desktop_ssl_variants:
description: 'CSV of desktop SSL variants to use'
Expand Down Expand Up @@ -50,7 +50,7 @@ env:
triggerLabelFull: "tests-requested: full"
triggerLabelQuick: "tests-requested: quick"
pythonVersion: '3.9'
xcodeVersion: '26.2'
xcodeVersion: '26.4'
logArtifactRetentionDays: 90
binaryArtifactRetentionDays: 7
GITHUB_TOKEN: ${{ github.token }}
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
# at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo
echo "::warning ::Running against Firestore tip-of-tree"
matrix_platform="Desktop"
matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-22.04,macos-15")
matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-22.04,macos-26")
else
matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${GITHUB_EVENT_INPUTS_PLATFORMS}" --apis ${apis} )
matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${GITHUB_EVENT_INPUTS_OPERATING_SYSTEMS}")
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
- os: ubuntu-22.04
arch: arm64
# Do not attempt to use x86 on Mac.
- os: macos-15
- os: macos-26
arch: x86
# Until we support building openssl from source, we can't use the
# system's openssl when cross-compiling, except on Linux. Builds on Linux
Expand All @@ -301,7 +301,7 @@ jobs:
- os: windows-2022
ssl_variant: openssl
arch: x86
- os: macos-15
- os: macos-26
ssl_variant: openssl
arch: x64
steps:
Expand Down Expand Up @@ -511,8 +511,8 @@ jobs:
id: cache_ndk
uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # ratchet:actions/cache@v3
with:
path: /tmp/android-ndk-r21e
key: android-ndk-${{ matrix.os }}-r21e
path: /tmp/android-ndk-r23b
key: android-ndk-${{ matrix.os }}-r23b
- name: Setup python
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # ratchet:actions/setup-python@v4
with:
Expand Down Expand Up @@ -622,7 +622,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-15]
os: [macos-26]
steps:
- uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # ratchet:lukka/get-cmake@latest
with:
Expand Down Expand Up @@ -745,7 +745,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-15]
os: [macos-26]
steps:
- uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # ratchet:lukka/get-cmake@latest
with:
Expand Down Expand Up @@ -878,7 +878,7 @@ jobs:
- os: ubuntu-22.04
arch: arm64
# Do not attempt to use x86 on Mac.
- os: macos-15
- os: macos-26
arch: x86
# Until we support building openssl from source, we can't use the
# system's openssl when cross-compiling, except on Linux. Builds on Linux
Expand All @@ -887,7 +887,7 @@ jobs:
- os: windows-2022
ssl_variant: openssl
arch: x86
- os: macos-15
- os: macos-26
ssl_variant: openssl
arch: x64
steps:
Expand Down Expand Up @@ -1152,7 +1152,7 @@ jobs:
test_ios:
name: test-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}
needs: [check_and_prepare, build_ios]
runs-on: macos-15
runs-on: macos-26
permissions:
contents: read
pull-requests: write
Expand All @@ -1166,7 +1166,7 @@ jobs:
exclude:
- ios_device: "ios_target"
test_type: "uitest"
build_os: [macos-15]
build_os: [macos-26]
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
with:
Expand Down Expand Up @@ -1342,7 +1342,7 @@ jobs:
test_tvos:
name: test-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}
needs: [check_and_prepare, build_tvos]
runs-on: macos-15
runs-on: macos-26
permissions:
contents: read
pull-requests: write
Expand All @@ -1352,7 +1352,7 @@ jobs:
matrix:

tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }}
build_os: [macos-15]
build_os: [macos-26]
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ 'macos-15' ]
os: [ 'macos-26' ]
xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
steps:
- uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # ratchet:lukka/get-cmake@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
jobs:
update_dependencies:
name: update-deps
runs-on: macos-15
runs-on: macos-26
steps:
- name: Get token for firebase-workflow-trigger
uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # ratchet:actions/create-github-app-token@v1
Expand Down Expand Up @@ -209,7 +209,7 @@
GITHUB_EVENT_INPUTS_BASEBRANCH: ${{ github.event.inputs.baseBranch }}

- name: Set test trigger label.
uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf # ratchet:actions-ecosystem/action-add-labels@v1

Check notice on line 212 in .github/workflows/update-dependencies.yml

View workflow job for this annotation

GitHub Actions / zizmor-output

superfluous-actions

update-dependencies.yml:212: action functionality is already included by the runner: use `gh issue edit --add-label` or `gh pr edit --add-label` in a script step
if: ${{ github.event.inputs.triggerTests == 1 && steps.push-branch.outputs.branch_pushed == 1 }}
with:
github_token: ${{ steps.generate-token.outputs.token }}
Expand Down
4 changes: 2 additions & 2 deletions Android/firebase_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def firebaseDependenciesMap = [
'app_check' : ['com.google.firebase:firebase-appcheck',
'com.google.firebase:firebase-appcheck-debug',
'com.google.firebase:firebase-appcheck-playintegrity'],
'play_services' : ['com.google.android.gms:play-services-base:18.10.1'],
'play_services' : ['com.google.android.gms:play-services-base:18.11.0'],
'analytics' : ['com.google.firebase:firebase-analytics'],
'auth' : ['com.google.firebase:firebase-auth'],
'database' : ['com.google.firebase:firebase-database'],
Expand Down Expand Up @@ -148,7 +148,7 @@ project.afterEvaluate {

// Add the bill-of-materials
project.dependencies {
implementation platform('com.google.firebase:firebase-bom:34.19.0')
implementation platform('com.google.firebase:firebase-bom:35.0.0')
}
for (String lib : firebaseCpp.dependencies.libSet) {
// Generate and include the proguard file
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

cmake_minimum_required(VERSION 3.22)

set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Turn on virtual folders for visual studio
Expand Down
4 changes: 2 additions & 2 deletions analytics/integration_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
# The include directory for the testapp.
include_directories(src)

# Firebase C++ SDK requires C++14.
set (CMAKE_CXX_STANDARD 14)
# Firebase C++ SDK requires C++17.
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.

# Download and unpack googletest (and googlemock) at configure time
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
Expand Down Expand Up @@ -379,7 +379,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
Expand Down Expand Up @@ -482,7 +482,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
Expand Down Expand Up @@ -536,7 +536,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
Expand Down Expand Up @@ -588,7 +588,7 @@
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = exactVersion;
version = 12.19.0;
version = 13.0.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.19.0')
implementation platform('com.google.firebase:firebase-bom:35.0.0')
implementation 'com.google.firebase:firebase-analytics'
}

Expand Down
Loading
Loading