From 54ea0e33f6bf532f1e9de547c6db88b30608873c Mon Sep 17 00:00:00 2001 From: Austin Benoit Date: Thu, 8 Jan 2026 12:10:10 -0500 Subject: [PATCH 1/3] chore: update minimum cmake version to 3.30 --- CMakeLists.txt | 2 +- analytics/integration_test/CMakeLists.txt | 2 +- analytics/integration_test/googletest.cmake | 2 +- app/integration_test/CMakeLists.txt | 2 +- app/integration_test/googletest.cmake | 2 +- app/rest/CMakeLists.txt | 2 +- app_check/integration_test/CMakeLists.txt | 2 +- app_check/integration_test/googletest.cmake | 2 +- auth/integration_test/CMakeLists.txt | 2 +- auth/integration_test/googletest.cmake | 2 +- cmake/external/CMakeLists.txt | 2 +- cmake/external/firebase_ios_sdk.cmake | 2 +- cmake/toolchains/apple.toolchain.cmake | 2 +- database/integration_test/CMakeLists.txt | 2 +- database/integration_test/googletest.cmake | 2 +- firestore/integration_test/CMakeLists.txt | 2 +- firestore/integration_test/googletest.cmake | 2 +- firestore/integration_test_internal/CMakeLists.txt | 2 +- firestore/integration_test_internal/abseil-cpp.cmake | 2 +- firestore/integration_test_internal/googletest.cmake | 2 +- functions/integration_test/CMakeLists.txt | 2 +- functions/integration_test/googletest.cmake | 2 +- installations/integration_test/CMakeLists.txt | 2 +- installations/integration_test/googletest.cmake | 2 +- ios_pod/empty_CMakeLists.txt | 6 ++---- messaging/integration_test/CMakeLists.txt | 2 +- messaging/integration_test/googletest.cmake | 2 +- release_build_files/CMakeLists.txt | 4 ++-- remote_config/integration_test/CMakeLists.txt | 2 +- remote_config/integration_test/googletest.cmake | 2 +- storage/integration_test/CMakeLists.txt | 2 +- storage/integration_test/googletest.cmake | 2 +- testing/CMakeLists.txt | 2 +- ump/integration_test/CMakeLists.txt | 2 +- ump/integration_test/googletest.cmake | 2 +- 35 files changed, 37 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ac6178fb3..b4625b26f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ # Top level CMake file that defines the entire Firebase C++ SDK build. -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required(VERSION 3.30) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version. diff --git a/analytics/integration_test/CMakeLists.txt b/analytics/integration_test/CMakeLists.txt index fddfc0ec58..1eb579c5ed 100644 --- a/analytics/integration_test/CMakeLists.txt +++ b/analytics/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/analytics/integration_test/googletest.cmake b/analytics/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/analytics/integration_test/googletest.cmake +++ b/analytics/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/app/integration_test/CMakeLists.txt b/app/integration_test/CMakeLists.txt index e0aaacdfb7..800e6221c4 100644 --- a/app/integration_test/CMakeLists.txt +++ b/app/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/app/integration_test/googletest.cmake b/app/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/app/integration_test/googletest.cmake +++ b/app/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/app/rest/CMakeLists.txt b/app/rest/CMakeLists.txt index 8d58c94f96..683382c01a 100644 --- a/app/rest/CMakeLists.txt +++ b/app/rest/CMakeLists.txt @@ -14,7 +14,7 @@ # CMake file for the firebase_rest_lib library -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required(VERSION 3.30) # Firebase C++ SDK requires C++14. set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version. diff --git a/app_check/integration_test/CMakeLists.txt b/app_check/integration_test/CMakeLists.txt index 6e0f3f2a15..b1c63ad486 100644 --- a/app_check/integration_test/CMakeLists.txt +++ b/app_check/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/app_check/integration_test/googletest.cmake b/app_check/integration_test/googletest.cmake index 5efa28280b..a06ee46ad3 100644 --- a/app_check/integration_test/googletest.cmake +++ b/app_check/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/auth/integration_test/CMakeLists.txt b/auth/integration_test/CMakeLists.txt index a3bfb8256a..37eaf65601 100644 --- a/auth/integration_test/CMakeLists.txt +++ b/auth/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/auth/integration_test/googletest.cmake b/auth/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/auth/integration_test/googletest.cmake +++ b/auth/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt index c2377e8485..843ab4d36e 100644 --- a/cmake/external/CMakeLists.txt +++ b/cmake/external/CMakeLists.txt @@ -17,7 +17,7 @@ # setting up ExternalProjects for each dependency, and then building this # project, which is done via external_rules.cmake, one directory above. -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.30) project(Firebase-cpp-download C CXX) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) diff --git a/cmake/external/firebase_ios_sdk.cmake b/cmake/external/firebase_ios_sdk.cmake index 0bed447371..59513850e8 100644 --- a/cmake/external/firebase_ios_sdk.cmake +++ b/cmake/external/firebase_ios_sdk.cmake @@ -18,7 +18,7 @@ if(TARGET firebase_ios_sdk OR NOT DOWNLOAD_FIREBASE_IOS_SDK) return() endif() -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.30) set(SDK_VERSION "6.14.0") diff --git a/cmake/toolchains/apple.toolchain.cmake b/cmake/toolchains/apple.toolchain.cmake index f876c9327d..83a5ecae65 100644 --- a/cmake/toolchains/apple.toolchain.cmake +++ b/cmake/toolchains/apple.toolchain.cmake @@ -142,7 +142,7 @@ # command. # -cmake_minimum_required(VERSION 3.8.0) +cmake_minimum_required(VERSION 3.30) # CMake invokes the toolchain file twice during the first build, but only once during subsequent rebuilds. if(IOS_TOOLCHAIN_HAS_RUN) diff --git a/database/integration_test/CMakeLists.txt b/database/integration_test/CMakeLists.txt index 1bab3ecd56..e8e0700a1a 100644 --- a/database/integration_test/CMakeLists.txt +++ b/database/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/database/integration_test/googletest.cmake b/database/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/database/integration_test/googletest.cmake +++ b/database/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/firestore/integration_test/CMakeLists.txt b/firestore/integration_test/CMakeLists.txt index 7dd3952a47..c16723e199 100644 --- a/firestore/integration_test/CMakeLists.txt +++ b/firestore/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/firestore/integration_test/googletest.cmake b/firestore/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/firestore/integration_test/googletest.cmake +++ b/firestore/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/firestore/integration_test_internal/CMakeLists.txt b/firestore/integration_test_internal/CMakeLists.txt index 99ba6ccaa3..7d6e63b7e5 100644 --- a/firestore/integration_test_internal/CMakeLists.txt +++ b/firestore/integration_test_internal/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/firestore/integration_test_internal/abseil-cpp.cmake b/firestore/integration_test_internal/abseil-cpp.cmake index 06e126faa8..606e36bae3 100644 --- a/firestore/integration_test_internal/abseil-cpp.cmake +++ b/firestore/integration_test_internal/abseil-cpp.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) include(ExternalProject) set(version 20200225) diff --git a/firestore/integration_test_internal/googletest.cmake b/firestore/integration_test_internal/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/firestore/integration_test_internal/googletest.cmake +++ b/firestore/integration_test_internal/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/functions/integration_test/CMakeLists.txt b/functions/integration_test/CMakeLists.txt index b65f09a42d..2ce110c589 100644 --- a/functions/integration_test/CMakeLists.txt +++ b/functions/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/functions/integration_test/googletest.cmake b/functions/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/functions/integration_test/googletest.cmake +++ b/functions/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/installations/integration_test/CMakeLists.txt b/installations/integration_test/CMakeLists.txt index f849ff4fa1..531f6a34dd 100644 --- a/installations/integration_test/CMakeLists.txt +++ b/installations/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/installations/integration_test/googletest.cmake b/installations/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/installations/integration_test/googletest.cmake +++ b/installations/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/ios_pod/empty_CMakeLists.txt b/ios_pod/empty_CMakeLists.txt index b332c81e71..f093e34b26 100644 --- a/ios_pod/empty_CMakeLists.txt +++ b/ios_pod/empty_CMakeLists.txt @@ -12,9 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Stub cmake project to enable pod files to be installed against +cmake_minimum_required (VERSION 3.30) -cmake_minimum_required (VERSION 3.1) - -project (GetPods CXX) +project (empty NONE) add_library(GetPods empty.cc) diff --git a/messaging/integration_test/CMakeLists.txt b/messaging/integration_test/CMakeLists.txt index 8f069b2b9b..5f4bb15065 100644 --- a/messaging/integration_test/CMakeLists.txt +++ b/messaging/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/messaging/integration_test/googletest.cmake b/messaging/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/messaging/integration_test/googletest.cmake +++ b/messaging/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/release_build_files/CMakeLists.txt b/release_build_files/CMakeLists.txt index 98c8a69277..29502c7f44 100644 --- a/release_build_files/CMakeLists.txt +++ b/release_build_files/CMakeLists.txt @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Top level CMake file that defines targets for the Firebase C++ SDK. +cmake_minimum_required(VERSION 3.30) -cmake_minimum_required(VERSION 3.1) +project (firebase_prebuilt NONE) include(FindPkgConfig) diff --git a/remote_config/integration_test/CMakeLists.txt b/remote_config/integration_test/CMakeLists.txt index d34a64fbe9..69c8e61b18 100644 --- a/remote_config/integration_test/CMakeLists.txt +++ b/remote_config/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/remote_config/integration_test/googletest.cmake b/remote_config/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/remote_config/integration_test/googletest.cmake +++ b/remote_config/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/storage/integration_test/CMakeLists.txt b/storage/integration_test/CMakeLists.txt index c700a0e260..1130e39ba1 100644 --- a/storage/integration_test/CMakeLists.txt +++ b/storage/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/storage/integration_test/googletest.cmake b/storage/integration_test/googletest.cmake index 2261a3a7f6..0153734dc7 100644 --- a/storage/integration_test/googletest.cmake +++ b/storage/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 56c07e25bc..62f6d61cf9 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required(VERSION 3.30) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version. diff --git a/ump/integration_test/CMakeLists.txt b/ump/integration_test/CMakeLists.txt index 5db68bc397..12e5f2b011 100644 --- a/ump/integration_test/CMakeLists.txt +++ b/ump/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.30) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/ump/integration_test/googletest.cmake b/ump/integration_test/googletest.cmake index a643a3e2f2..6b3e855f2b 100644 --- a/ump/integration_test/googletest.cmake +++ b/ump/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.30) project(googletest-download NONE) From 1d9ac827aaa2a797fdf47f94c57f31f1f8ba07e9 Mon Sep 17 00:00:00 2001 From: Austin Benoit Date: Thu, 8 Jan 2026 13:37:45 -0500 Subject: [PATCH 2/3] Chore: update to 3.22 3.30 was causing issues with the Android builds so it makes more sense to start with a 3.22 upgrade and then try for 4.X upgrade later. We will still get most of pros when doing this upgrade anyways. --- CMakeLists.txt | 2 +- analytics/integration_test/CMakeLists.txt | 2 +- analytics/integration_test/googletest.cmake | 2 +- app/integration_test/CMakeLists.txt | 2 +- app/integration_test/googletest.cmake | 2 +- app/rest/CMakeLists.txt | 2 +- app_check/integration_test/CMakeLists.txt | 2 +- app_check/integration_test/googletest.cmake | 2 +- auth/integration_test/CMakeLists.txt | 2 +- auth/integration_test/googletest.cmake | 2 +- cmake/external/CMakeLists.txt | 2 +- cmake/external/firebase_ios_sdk.cmake | 2 +- cmake/toolchains/apple.toolchain.cmake | 2 +- database/integration_test/CMakeLists.txt | 2 +- database/integration_test/googletest.cmake | 2 +- firestore/integration_test/CMakeLists.txt | 2 +- firestore/integration_test/googletest.cmake | 2 +- firestore/integration_test_internal/CMakeLists.txt | 2 +- firestore/integration_test_internal/abseil-cpp.cmake | 2 +- firestore/integration_test_internal/googletest.cmake | 2 +- functions/integration_test/CMakeLists.txt | 2 +- functions/integration_test/googletest.cmake | 2 +- installations/integration_test/CMakeLists.txt | 2 +- installations/integration_test/googletest.cmake | 2 +- ios_pod/empty_CMakeLists.txt | 2 +- messaging/integration_test/CMakeLists.txt | 2 +- messaging/integration_test/googletest.cmake | 2 +- release_build_files/CMakeLists.txt | 2 +- remote_config/integration_test/CMakeLists.txt | 2 +- remote_config/integration_test/googletest.cmake | 2 +- storage/integration_test/CMakeLists.txt | 2 +- storage/integration_test/googletest.cmake | 2 +- testing/CMakeLists.txt | 2 +- ump/integration_test/CMakeLists.txt | 2 +- ump/integration_test/googletest.cmake | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4625b26f8..7152fc04e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ # Top level CMake file that defines the entire Firebase C++ SDK build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version. diff --git a/analytics/integration_test/CMakeLists.txt b/analytics/integration_test/CMakeLists.txt index 1eb579c5ed..953008a226 100644 --- a/analytics/integration_test/CMakeLists.txt +++ b/analytics/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/analytics/integration_test/googletest.cmake b/analytics/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/analytics/integration_test/googletest.cmake +++ b/analytics/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/app/integration_test/CMakeLists.txt b/app/integration_test/CMakeLists.txt index 800e6221c4..fd0b0f8de5 100644 --- a/app/integration_test/CMakeLists.txt +++ b/app/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/app/integration_test/googletest.cmake b/app/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/app/integration_test/googletest.cmake +++ b/app/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/app/rest/CMakeLists.txt b/app/rest/CMakeLists.txt index 683382c01a..dce22ec2e1 100644 --- a/app/rest/CMakeLists.txt +++ b/app/rest/CMakeLists.txt @@ -14,7 +14,7 @@ # CMake file for the firebase_rest_lib library -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) # Firebase C++ SDK requires C++14. set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version. diff --git a/app_check/integration_test/CMakeLists.txt b/app_check/integration_test/CMakeLists.txt index b1c63ad486..55dbb37941 100644 --- a/app_check/integration_test/CMakeLists.txt +++ b/app_check/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/app_check/integration_test/googletest.cmake b/app_check/integration_test/googletest.cmake index a06ee46ad3..63d25825dd 100644 --- a/app_check/integration_test/googletest.cmake +++ b/app_check/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/auth/integration_test/CMakeLists.txt b/auth/integration_test/CMakeLists.txt index 37eaf65601..164f89ce46 100644 --- a/auth/integration_test/CMakeLists.txt +++ b/auth/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/auth/integration_test/googletest.cmake b/auth/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/auth/integration_test/googletest.cmake +++ b/auth/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt index 843ab4d36e..2ca2da355c 100644 --- a/cmake/external/CMakeLists.txt +++ b/cmake/external/CMakeLists.txt @@ -17,7 +17,7 @@ # setting up ExternalProjects for each dependency, and then building this # project, which is done via external_rules.cmake, one directory above. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(Firebase-cpp-download C CXX) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) diff --git a/cmake/external/firebase_ios_sdk.cmake b/cmake/external/firebase_ios_sdk.cmake index 59513850e8..6613c8f577 100644 --- a/cmake/external/firebase_ios_sdk.cmake +++ b/cmake/external/firebase_ios_sdk.cmake @@ -18,7 +18,7 @@ if(TARGET firebase_ios_sdk OR NOT DOWNLOAD_FIREBASE_IOS_SDK) return() endif() -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) set(SDK_VERSION "6.14.0") diff --git a/cmake/toolchains/apple.toolchain.cmake b/cmake/toolchains/apple.toolchain.cmake index 83a5ecae65..c0c7925511 100644 --- a/cmake/toolchains/apple.toolchain.cmake +++ b/cmake/toolchains/apple.toolchain.cmake @@ -142,7 +142,7 @@ # command. # -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) # CMake invokes the toolchain file twice during the first build, but only once during subsequent rebuilds. if(IOS_TOOLCHAIN_HAS_RUN) diff --git a/database/integration_test/CMakeLists.txt b/database/integration_test/CMakeLists.txt index e8e0700a1a..700cb5088d 100644 --- a/database/integration_test/CMakeLists.txt +++ b/database/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/database/integration_test/googletest.cmake b/database/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/database/integration_test/googletest.cmake +++ b/database/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/firestore/integration_test/CMakeLists.txt b/firestore/integration_test/CMakeLists.txt index c16723e199..1225226305 100644 --- a/firestore/integration_test/CMakeLists.txt +++ b/firestore/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/firestore/integration_test/googletest.cmake b/firestore/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/firestore/integration_test/googletest.cmake +++ b/firestore/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/firestore/integration_test_internal/CMakeLists.txt b/firestore/integration_test_internal/CMakeLists.txt index 7d6e63b7e5..1a25cc9510 100644 --- a/firestore/integration_test_internal/CMakeLists.txt +++ b/firestore/integration_test_internal/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/firestore/integration_test_internal/abseil-cpp.cmake b/firestore/integration_test_internal/abseil-cpp.cmake index 606e36bae3..0f27965b6b 100644 --- a/firestore/integration_test_internal/abseil-cpp.cmake +++ b/firestore/integration_test_internal/abseil-cpp.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) include(ExternalProject) set(version 20200225) diff --git a/firestore/integration_test_internal/googletest.cmake b/firestore/integration_test_internal/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/firestore/integration_test_internal/googletest.cmake +++ b/firestore/integration_test_internal/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/functions/integration_test/CMakeLists.txt b/functions/integration_test/CMakeLists.txt index 2ce110c589..305f802ee4 100644 --- a/functions/integration_test/CMakeLists.txt +++ b/functions/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/functions/integration_test/googletest.cmake b/functions/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/functions/integration_test/googletest.cmake +++ b/functions/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/installations/integration_test/CMakeLists.txt b/installations/integration_test/CMakeLists.txt index 531f6a34dd..f740f178f6 100644 --- a/installations/integration_test/CMakeLists.txt +++ b/installations/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/installations/integration_test/googletest.cmake b/installations/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/installations/integration_test/googletest.cmake +++ b/installations/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/ios_pod/empty_CMakeLists.txt b/ios_pod/empty_CMakeLists.txt index f093e34b26..a70e2d894c 100644 --- a/ios_pod/empty_CMakeLists.txt +++ b/ios_pod/empty_CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required (VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project (empty NONE) add_library(GetPods empty.cc) diff --git a/messaging/integration_test/CMakeLists.txt b/messaging/integration_test/CMakeLists.txt index 5f4bb15065..9fcf569035 100644 --- a/messaging/integration_test/CMakeLists.txt +++ b/messaging/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/messaging/integration_test/googletest.cmake b/messaging/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/messaging/integration_test/googletest.cmake +++ b/messaging/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/release_build_files/CMakeLists.txt b/release_build_files/CMakeLists.txt index 29502c7f44..0b7260703a 100644 --- a/release_build_files/CMakeLists.txt +++ b/release_build_files/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project (firebase_prebuilt NONE) diff --git a/remote_config/integration_test/CMakeLists.txt b/remote_config/integration_test/CMakeLists.txt index 69c8e61b18..e6a570eea9 100644 --- a/remote_config/integration_test/CMakeLists.txt +++ b/remote_config/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/remote_config/integration_test/googletest.cmake b/remote_config/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/remote_config/integration_test/googletest.cmake +++ b/remote_config/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/storage/integration_test/CMakeLists.txt b/storage/integration_test/CMakeLists.txt index 1130e39ba1..1fc6cad1d3 100644 --- a/storage/integration_test/CMakeLists.txt +++ b/storage/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/storage/integration_test/googletest.cmake b/storage/integration_test/googletest.cmake index 0153734dc7..8b0069a034 100644 --- a/storage/integration_test/googletest.cmake +++ b/storage/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 62f6d61cf9..e0da74d416 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version. diff --git a/ump/integration_test/CMakeLists.txt b/ump/integration_test/CMakeLists.txt index 12e5f2b011..01bab7b8a4 100644 --- a/ump/integration_test/CMakeLists.txt +++ b/ump/integration_test/CMakeLists.txt @@ -14,7 +14,7 @@ # Cmake file for a single C++ integration test build. -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) find_program(FIREBASE_PYTHON_EXECUTABLE NAMES python3 python diff --git a/ump/integration_test/googletest.cmake b/ump/integration_test/googletest.cmake index 6b3e855f2b..91fc42cc10 100644 --- a/ump/integration_test/googletest.cmake +++ b/ump/integration_test/googletest.cmake @@ -18,7 +18,7 @@ # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.22) project(googletest-download NONE) From dbb69b6487b824f085ecbe45f103c4bae912f0b4 Mon Sep 17 00:00:00 2001 From: Austin Benoit Date: Thu, 8 Jan 2026 13:44:48 -0500 Subject: [PATCH 3/3] fixup: the change now requires a cxx label so its included --- ios_pod/empty_CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios_pod/empty_CMakeLists.txt b/ios_pod/empty_CMakeLists.txt index a70e2d894c..abb9a6188d 100644 --- a/ios_pod/empty_CMakeLists.txt +++ b/ios_pod/empty_CMakeLists.txt @@ -14,5 +14,5 @@ cmake_minimum_required(VERSION 3.22) -project (empty NONE) +project (empty CXX) add_library(GetPods empty.cc)