Merge branch 'main' into feature/enable-tvos-packaging

Author: vimanyu

.github/workflows/checks_secure.yml

@@ -0,0 +1,38 @@
+name: Checks (secure)
+# These are run on base branch with read/write access.
+
+on:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  dismiss_stale_approvals:
+    # Dismiss stale approvals for non-admins or if this PR comes from a fork.
+    runs-on: ubuntu-latest
+    # Only if another commit was added to the PR.
+    steps:
+      - name: Check user permission
+        id: check
+        uses: scherermichael-oss/[email protected]
+        # This action sets outputs.has-permission to '1' or ''
+        with:
+          required-permission: admin
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+      - uses: actions/checkout@v2
+        if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
+        with:
+          submodules: false
+      - name: Setup python
+        if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install prerequisites
+        if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
+        run: pip install -r scripts/gha/requirements.txt
+      - name: Dismiss reviews
+        if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
+        shell: bash
+        run: |
+          python scripts/gha/dismiss_reviews.py --token ${{github.token}} --pull_number ${{github.event.pull_request.number}} --review_state=APPROVED --message "🍞 Dismissed stale approval on external PR."

CMakeLists.txt

@@ -198,9 +198,17 @@ if(FIREBASE_INCLUDE_FIRESTORE AND DESKTOP)
 endif()
 
 if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
+  # Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
+  # match it in a regex.
+  # For example, '/path/with/+meta/char.acters' will become
+  # '/path/with/\+meta/char\.acters'.
+  string(REGEX REPLACE
+         "([][+.*()^])" "\\\\\\1"  # Yes, this many \'s is correct.
+         current_list_dir_regex
+         "${CMAKE_CURRENT_LIST_DIR}")
   # Figure out where app's binary_dir was.
   string(REGEX REPLACE
-    "${CMAKE_CURRENT_LIST_DIR}/[^/]+/(.*)"
+    "${current_list_dir_regex}/[^/]+/(.*)"
     "${CMAKE_CURRENT_LIST_DIR}/app/\\1"
     APP_BINARY_DIR "${FIREBASE_BINARY_DIR}")
 

cmake/external/googletest.cmake

@@ -18,20 +18,20 @@ if(TARGET googletest OR NOT DOWNLOAD_GOOGLETEST)
   return()
 endif()
 
-set(version 1.10.0)
+set(version 1.11.0) # June 2021
 
 ExternalProject_Add(
   googletest
 
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME googletest-${version}.tar.gz
   URL https://github.com/google/googletest/archive/release-${version}.tar.gz
-  URL_HASH SHA256=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+  URL_HASH SHA256=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
 
   PREFIX ${PROJECT_BINARY_DIR}
 
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
   TEST_COMMAND ""
-)
+)

external/vcpkg

@@ -378,5 +378,9 @@ add_subdirectory(${FIREBASE_CPP_SDK_DIR} bin/ EXCLUDE_FROM_ALL)
 # Note that firebase_app needs to be last in the list.
 set(firebase_libs firebase_firestore firebase_auth firebase_app)
 set(gtest_libs gtest gmock)
+# Validation tests need exceptions to be enabled in order to run. The only
+# library that explicitly disables exceptions is App (but it gets propagated
+# everywhere), so overriding that effectively reenables exceptions.
+target_compile_options(firebase_app PUBLIC -fexceptions)
 target_link_libraries(${integration_test_target_name} ${firebase_libs}
   ${gtest_libs} ${ADDITIONAL_LIBS})

firestore/integration_test_internal/CMakeLists.txt

@@ -177,8 +177,12 @@ TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
         progresses.push_back(progress);
         // Delete firestore before the final progress.
         if (progresses.size() == 3) {
+          // Save `db_deleted` to a local variable because this lambda gets
+          // deleted by the call to `DeleteFirestore()` below, and therefore it
+          // is undefined behavior to access any captured variables thereafter.
+          auto& db_deleted_local = db_deleted;
           DeleteFirestore(db);
-          db_deleted.set_value();
+          db_deleted_local.set_value();
         }
       });