Skip to content

Commit 4b914d2

Browse files
DellaBittasunmou99dconeybeTBarendtjonsimantov
authored
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>
2 parents b495952 + 311bed9 commit 4b914d2

144 files changed

Lines changed: 1615 additions & 1844 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/cpp-packaging.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,8 @@ jobs:
433433
run: |
434434
cd out-sdk
435435
find .. -type f -print > src_file_list.txt
436+
# Remove intermediate build files (.o and .obj) files to save space.
437+
find . -type f -name '*.o' -or -name '*.obj' -print0 | xargs -0 rm -f --
436438
tar -czhf ../firebase-cpp-sdk-${{ env.SDK_NAME }}-build.tgz .
437439
438440
- name: Print built libraries
@@ -782,6 +784,7 @@ jobs:
782784
- name: Use GitHub API to start workflow
783785
shell: bash
784786
run: |
787+
pip install -r scripts/gha/requirements.txt
785788
if [[ -z ${USE_EXPANDED_MATRIX} ]]; then
786789
USE_EXPANDED_MATRIX=0
787790
fi

‎.github/workflows/integration_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ jobs:
829829
npm install -g firebase-tools
830830
firebase emulators:start --only firestore --project demo-example &
831831
- name: Run Android integration tests on Emulator locally
832-
timeout-minutes: 60
832+
timeout-minutes: 90
833833
if: steps.get-device-type.outputs.device_type == 'virtual'
834834
run: |
835835
python scripts/gha/test_simulator.py --testapp_dir testapps \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,21 @@ class BannerView : public AdView {
9999
///
100100
/// param[in] listener A listener object which will be invoked when lifecycle
101101
/// events occur on this AdView.
102-
void SetAdListener(AdListener *listener) override;
102+
void SetAdListener(AdListener* listener) override;
103103

104104
/// Sets a listener to be invoked when the Ad's bounding box
105105
/// changes size or location.
106106
///
107107
/// param[in] listener A listener object which will be invoked when the ad
108108
/// changes size, shape, or position.
109-
void SetBoundingBoxListener(AdViewBoundingBoxListener *listener) override;
109+
void SetBoundingBoxListener(AdViewBoundingBoxListener* listener) override;
110110

111111
/// Sets a listener to be invoked when this ad is estimated to have earned
112112
/// money.
113113
///
114114
/// param[in] A listener object to be invoked when a paid event occurs on the
115115
/// ad.
116-
void SetPaidEventListener(PaidEventListener *listener) override;
116+
void SetPaidEventListener(PaidEventListener* listener) override;
117117

118118
/// Moves the @ref BannerView so that its top-left corner is located at
119119
/// (x, y). Coordinates are in pixels from the top-left corner of the screen.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class RewardedAd {
137137
/// ServerSideVerificationOptions object containing custom data and a user
138138
/// Id.
139139
void SetServerSideVerificationOptions(
140-
const ServerSideVerificationOptions &serverSideVerificationOptions);
140+
const ServerSideVerificationOptions& serverSideVerificationOptions);
141141

142142
private:
143143
// An internal, platform-specific implementation object that this class uses

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
/**
2525
* Helper class for initializing the AdMob SDK.
2626
*/
27-
public final class AdMobInitializationHelper {
27+
public final class AdMobInitializationHelper {
2828
public static void initializeAdMob(Context context) {
2929
MobileAds.initialize(context, new OnInitializationCompleteListener() {
3030
@Override
3131
public void onInitializationComplete(InitializationStatus initializationStatus) {
3232
initializationCompleteCallback(initializationStatus);
3333
}
3434
});
35-
}
36-
37-
public static native void initializationCompleteCallback(InitializationStatus initializationStatus);
35+
}
36+
37+
public static native void initializationCompleteCallback(
38+
InitializationStatus initializationStatus);
3839
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
* into their (typically more complicated) Java equivalents.
2626
*/
2727
public class AdRequestHelper {
28-
2928
public AdRequestHelper() {}
3029

3130
/**

0 commit comments

Comments
 (0)