Merge main into the AdMob Feature Branch (#771)

* Fix test on emulator workflow failures (#734)

* If simulator  install ios app failed, reset simulator and try again (#733)

* Trigger workflow move github api cod to github.py (#746)

* Fix a data race that could manifest as null pointer dereference in FutureBase::Release() (#747)

* Cancel callbacks for messaging (#745)

* Cancel callbacks for messaging

util::Terminate is referenced counted som when there ar more APIs than messaging active the callbacks will not be canceled until later and still cause a NULL ref due to the FutureData being destroyed now.

* Cancel callback earlier

* Update readme

* Remove "Android" tag from the release notes entry for #747 (#749)

* Remove calls to LogInfo, LogError, LogDebug during obj-c +load. (#706)

* Remove calls to LogInfo, LogError, LogDebug during obj-c +load.

This could be causing an issue in C++ as global class constructors have not yet been run.

* Add Objective-C/C++ and Java to code formatter script; format those files. (#755)

* Allow format_code to format .m/.mm files; clang-format already knows how.

* Run format_code.py on all objective-c/objective-c++ files.

* Add Java file extensions to format_code.py

* Format all Java source files.

* Remove check for objc header, as they are now supported.

* Format objective-c .h files.

* Don't let lint comment on line length any more; code formatting will report that.

* Messaging crash during initialization (#760)

* Messaging crash during initialization

* Update readme

* Don't redeclare inherited state in CredentialsProviderDesktop (#731)

* Reduce disk space usage when packaging the built SDK (#763)

Remove intermediate build files during desktop packaging step.

This should reduce the disk space usage, as those files (*.o and *.obj) are not required when merging libraries.

* Workaround for Linux x86 build:  downgrade libraries on GitHub runners (#764)

When installing 32-bit Linux dependencies on GitHub runners, downgrade libpcre2-8-0 to an earlier version to ensure compatibility with the i386 version of the package. This is something that should be fixed in a subsequent Ubuntu release and so is a temporary workaround.

This also adds checks to the various prerequisite commands run by build_desktop.py, which was previously just silently ignoring errors (making this much harder to track down). Now it will error out as soon as a command fails.

Co-authored-by: Mou Sun <69009538+sunmou99@users.noreply.github.com>
Co-authored-by: Denver Coneybeare <dconeybe@google.com>
Co-authored-by: Tobias Barendt <tobias@robotsquid.com>
Co-authored-by: Jon Simantov <jsimantov@google.com>
Co-authored-by: Sebastian Schmidt <mrschmidt@google.com>

Author: 6 people

.github/workflows/cpp-packaging.yml

@@ -433,6 +433,8 @@ jobs:
         run: |
           cd out-sdk
           find .. -type f -print > src_file_list.txt
+          # Remove intermediate build files (.o and .obj) files to save space.
+          find . -type f -name '*.o' -or -name '*.obj' -print0 | xargs -0 rm -f --
           tar -czhf ../firebase-cpp-sdk-${{ env.SDK_NAME }}-build.tgz .
 
       - name: Print built libraries
@@ -782,6 +784,7 @@ jobs:
     - name: Use GitHub API to start workflow
       shell: bash
       run: |
+        pip install -r scripts/gha/requirements.txt
         if [[ -z ${USE_EXPANDED_MATRIX} ]]; then
           USE_EXPANDED_MATRIX=0
         fi

.github/workflows/integration_tests.yml

@@ -829,7 +829,7 @@ jobs:
           npm install -g firebase-tools
           firebase emulators:start --only firestore --project demo-example &
       - name: Run Android integration tests on Emulator locally
-        timeout-minutes: 60
+        timeout-minutes: 90
         if: steps.get-device-type.outputs.device_type == 'virtual'
         run: |
           python scripts/gha/test_simulator.py --testapp_dir testapps \

admob/src/include/firebase/admob/banner_view.h

@@ -99,21 +99,21 @@ class BannerView : public AdView {
   ///
   /// param[in] listener A listener object which will be invoked when lifecycle
   /// events occur on this AdView.
-  void SetAdListener(AdListener *listener) override;
+  void SetAdListener(AdListener* listener) override;
 
   /// Sets a listener to be invoked when the Ad's bounding box
   /// changes size or location.
   ///
   /// param[in] listener A listener object which will be invoked when the ad
   /// changes size, shape, or position.
-  void SetBoundingBoxListener(AdViewBoundingBoxListener *listener) override;
+  void SetBoundingBoxListener(AdViewBoundingBoxListener* listener) override;
 
   /// Sets a listener to be invoked when this ad is estimated to have earned
   /// money.
   ///
   /// param[in] A listener object to be invoked when a paid event occurs on the
   /// ad.
-  void SetPaidEventListener(PaidEventListener *listener) override;
+  void SetPaidEventListener(PaidEventListener* listener) override;
 
   /// Moves the @ref BannerView so that its top-left corner is located at
   /// (x, y). Coordinates are in pixels from the top-left corner of the screen.

admob/src/include/firebase/admob/rewarded_ad.h

@@ -137,7 +137,7 @@ class RewardedAd {
   /// ServerSideVerificationOptions object containing custom data and a user
   /// Id.
   void SetServerSideVerificationOptions(
-      const ServerSideVerificationOptions &serverSideVerificationOptions);
+      const ServerSideVerificationOptions& serverSideVerificationOptions);
 
  private:
   // An internal, platform-specific implementation object that this class uses

admob/src_java/com/google/firebase/admob/internal/cpp/AdMobInitializationHelper.java

@@ -24,15 +24,16 @@
 /**
  * Helper class for initializing the AdMob SDK.
  */
-public final class AdMobInitializationHelper { 
+public final class AdMobInitializationHelper {
   public static void initializeAdMob(Context context) {
     MobileAds.initialize(context, new OnInitializationCompleteListener() {
       @Override
       public void onInitializationComplete(InitializationStatus initializationStatus) {
         initializationCompleteCallback(initializationStatus);
       }
     });
-  }      
-      
-  public static native void initializationCompleteCallback(InitializationStatus initializationStatus);
+  }
+
+  public static native void initializationCompleteCallback(
+      InitializationStatus initializationStatus);
 }

admob/src_java/com/google/firebase/admob/internal/cpp/AdRequestHelper.java

@@ -25,7 +25,6 @@
  * into their (typically more complicated) Java equivalents.
  */
 public class AdRequestHelper {
-
   public AdRequestHelper() {}
 
   /**