Merge branch 'main' into am-firestore_fix

a-maurice · a-maurice · commit e01cf8cbd9dd · 2026-02-23T10:12:28.000-08:00
diff --git 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.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
@@ -14,7 +14,7 @@
 
 # Cmake file for a single C++ integration test build.
 
-cmake_minimum_required(VERSION 2.8)
+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
@@ -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.22)
 
 project(googletest-download NONE)
 
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git 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.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
@@ -14,7 +14,7 @@
 
 # Cmake file for a single C++ integration test build.
 
-cmake_minimum_required(VERSION 2.8)
+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
@@ -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.22)
 
 project(googletest-download NONE)
 
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git 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.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
@@ -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.22)
 
 set(SDK_VERSION "6.14.0")
 
diff --git 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.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
@@ -14,7 +14,7 @@
 
 # Cmake file for a single C++ integration test build.
 
-cmake_minimum_required(VERSION 2.8)
+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
@@ -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.22)
 
 project(googletest-download NONE)
 
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git 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.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
@@ -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.22)
 include(ExternalProject)
 
 set(version 20200225)
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git a/ios_pod/empty_CMakeLists.txt b/ios_pod/empty_CMakeLists.txt
@@ -14,7 +14,7 @@
 
 # Stub cmake project to enable pod files to be installed against
 
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required(VERSION 3.22)
 
 project (GetPods CXX)
 add_library(GetPods empty.cc)
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git a/release_build_files/CMakeLists.txt b/release_build_files/CMakeLists.txt
@@ -14,7 +14,9 @@
 
 # Top level CMake file that defines targets for the Firebase C++ SDK.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.22)
+
+project (FirebasePrebuilt NONE)
 
 include(FindPkgConfig)
 
diff --git 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.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
@@ -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.22)
 
 project(googletest-download NONE)
 
diff --git 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.22)
 
 find_program(FIREBASE_PYTHON_EXECUTABLE
   NAMES python3 python
diff --git 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.22)
 
 project(googletest-download NONE)
 
diff --git 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.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
@@ -14,7 +14,7 @@
 
 # Cmake file for a single C++ integration test build.
 
-cmake_minimum_required(VERSION 2.8)
+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
@@ -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.22)
 
 project(googletest-download NONE)
 
