Merge branch 'main' into bugfix/app-cmake-exceptions-private

Author: vimanyu

.github/workflows/cpp-packaging.yml

@@ -142,8 +142,8 @@ jobs:
           name: packaging-tools-${{ matrix.tools_platform }}
           path: packaging-tools.tgz
 
-  build_and_package_ios:
-    name: build-and-package-ios
+  build_and_package_ios_tvos:
+    name: build-and-package-ios-tvos
     runs-on: macos-latest
     if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
     steps:
@@ -156,15 +156,21 @@ jobs:
         with:
           path: sdk-src
 
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
       - name: install prerequisites
         run: sdk-src/build_scripts/ios/install_prereqs.sh
 
       - name: build sdk
         run: |
-          sdk-src/build_scripts/ios/build.sh -b firebase-cpp-sdk-ios-build -s sdk-src
-          sdk-src/build_scripts/ios/package.sh firebase-cpp-sdk-ios-build firebase-cpp-sdk-ios-package
-          cd firebase-cpp-sdk-ios-package
-          tar -czhf ../firebase-cpp-sdk-ios-package.tgz .
+          python sdk-src/scripts/gha/build_ios_tvos.py -b firebase-cpp-sdk-ios-tvos-build -s sdk-src
+          sdk-src/build_scripts/ios/package.sh firebase-cpp-sdk-ios-tvos-build firebase-cpp-sdk-ios-tvos-package
+          sdk-src/build_scripts/tvos/package.sh firebase-cpp-sdk-ios-tvos-build firebase-cpp-sdk-ios-tvos-package
+          cd firebase-cpp-sdk-ios-tvos-package
+          tar -czhf ../firebase-cpp-sdk-ios-tvos-package.tgz .
 
       - name: Print built libraries
         shell: bash
@@ -184,8 +190,8 @@ jobs:
       - name: upload artifacts
         uses: actions/upload-artifact@v2.2.2
         with:
-          name: firebase-cpp-sdk-ios-package
-          path: firebase-cpp-sdk-ios-package.tgz
+          name: firebase-cpp-sdk-ios-tvos-package
+          path: firebase-cpp-sdk-ios-tvos-package.tgz
 
   build_and_package_android:
     name: build-and-package-android-${{matrix.stl}}
@@ -600,7 +606,7 @@ jobs:
     name: final-merge-packages
     runs-on: ubuntu-latest
     if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
-    needs: [build_and_package_ios, build_and_package_android, package_desktop, log_inputs]
+    needs: [build_and_package_ios_tvos, build_and_package_android, package_desktop, log_inputs]
     steps:
       - name: fetch SDK
         uses: actions/checkout@v2.3.1

CMakeLists.txt

@@ -118,8 +118,9 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
 endif()
 
 if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
-  # AdMob, FDL are not supported on tvOS.
+  # Analytics, AdMob, FDL are not supported on tvOS.
   set(FIREBASE_INCLUDE_ADMOB OFF)
+  set(FIREBASE_INCLUDE_ANALYTICS OFF)
   set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
 endif()
 

firestore/integration_test_internal/src/bundle_test.cc

@@ -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();
         }
       });
 

release_build_files/readme.md

@@ -569,6 +569,12 @@ code.
 
 ### 8.3.0
 -   Changes
+    -   General: This release adds tvOS C++ libraries that wrap the community
+        supported Firebase tvOS SDK. `libs/tvos` contains tvOS specific
+        libraries and the `xcframeworks` directory now includes support for both
+        iOS and tvOS. The following products are currently included for tvOS:
+        Auth, Database, Firestore, Functions, Installations, Messaging, 
+        Remote Config, Storage.
     -   Firestore: Removed the deprecated
         `Firestore::RunTransaction(TransactionFunction*)` function. Please use
         the overload that takes a `std::function` argument instead.

scripts/gha/build_ios_tvos.py

@@ -558,17 +558,18 @@ def main():
 
   # Since we renamed firebase_app.framework to firebase.framework we add that
   # to our list of targets.
-  supported_targets.add('firebase')
+  targets = set(args.target)
+  targets.add('firebase')
 
   # if we built for all architectures build universal framework as well.
-  build_universal_framework(frameworks_path, supported_targets)
+  build_universal_framework(frameworks_path, targets)
 
   # Build xcframeworks
   xcframeworks_path = os.path.join(args.build_dir, 'xcframeworks')
   template_info_plist_path = os.path.join(args.source_dir, 'build_scripts',
                                           'tvos', 'Info_ios_and_tvos.plist')
   build_xcframeworks(frameworks_path, xcframeworks_path,
-                     template_info_plist_path, supported_targets)
+                     template_info_plist_path, targets)
 
 
 def parse_cmdline_args():

scripts/gha/trigger_workflow.py

@@ -54,14 +54,13 @@ def main():
   json_params = {}
   for param in args.param:
       json_params[param[0]] = param[1]
-  json_params["platforms"] = "Desktop,Android,iOS"
   json_text = '{"ref":%s,"inputs":%s}' % (json.dumps(args.branch), json.dumps(json_params))
   if args.verbose or args.dryrun:
     print('request_url: %s' % request_url)
     print('request_body: %s' % json_text)
   if args.dryrun:
     return(0)
-  
+
   print('Sending request to GitHub API...')
   run_output = subprocess.check_output([args.curl,
                                         '-s', '-o', '-', '-w', '\nHTTP status %{http_code}\n',
@@ -104,7 +103,7 @@ def main():
           workflow['head_branch'] == args.branch):
         run_id = workflow['id']
         break
-  
+
   if run_id:
     workflow_url = 'https://github.com/firebase/firebase-cpp-sdk/actions/runs/%s' % (run_id)
   else: