Skip to content

Feature/admob 2021 adview, fullscreen listeners #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 64 commits into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
db93aaa
Android AdResult prototype
DellaBitta Sep 27, 2021
8116de4
linter fixes
DellaBitta Sep 27, 2021
0eb306e
cause becomes smart ptr. iOS and Desktop impls
DellaBitta Sep 27, 2021
15c7b55
linter fixes
DellaBitta Sep 27, 2021
41c9aed
Added AdapterResponseInfo & AdResponseInfo | AdResult fixes
DellaBitta Sep 29, 2021
903abd8
linter fixes
DellaBitta Sep 29, 2021
9fd06d2
load_ad_result | response info iOS
DellaBitta Sep 30, 2021
42643cd
draft LoadAdResult future on Android
DellaBitta Oct 3, 2021
0f9125f
successful load ad, need to trim debug info
DellaBitta Oct 4, 2021
ee2a38d
removed debug logs
DellaBitta Oct 4, 2021
693435e
Safe Futures
DellaBitta Oct 4, 2021
f740e43
stubs build, reworked futures to use safe API
DellaBitta Oct 5, 2021
23bf809
merged feature/admob_2021 with RequestConfig changes
DellaBitta Oct 5, 2021
89db0b3
Banner View Android Tests
DellaBitta Oct 6, 2021
a8543d9
Android, Desktop Interstitial tests
DellaBitta Oct 7, 2021
eb97f88
CreateAndCompleteFuture, enabled TestBannerViewMultithreadDeletion
DellaBitta Oct 7, 2021
8d2f2b9
ios and Android LoadAdResult rework
DellaBitta Oct 11, 2021
4476e68
linter fixes
DellaBitta Oct 12, 2021
fa2e305
added more comments
DellaBitta Oct 12, 2021
32865b9
no lint on JNI function signatures
DellaBitta Oct 12, 2021
4062d9a
skip loading in progress tests on desktop
DellaBitta Oct 12, 2021
d8e2e58
multithread test
DellaBitta Oct 12, 2021
19a50b2
Upgrade to GMA 8.12 for iOS
DellaBitta Oct 13, 2021
663adee
Merge branch 'feature/admob_ios_version_update' into feature/admob_20…
DellaBitta Oct 13, 2021
c89f0eb
lint fix
DellaBitta Oct 13, 2021
531d924
add inherited linker flags to xcodeproject
DellaBitta Oct 13, 2021
4e1f165
exclude i386 in Admob itest project
DellaBitta Oct 14, 2021
5519a0f
review fixes
DellaBitta Oct 18, 2021
a269f07
Android bannerview listeners
DellaBitta Oct 22, 2021
33bd11a
most bannerview operations use c++ runonmainthread
DellaBitta Oct 22, 2021
2e0e0a2
Android admob interstitial tests pass
DellaBitta Oct 25, 2021
d3fbdb6
itest name typo
DellaBitta Oct 25, 2021
4b577f3
bannerview init assertions and memory cleanup
DellaBitta Oct 25, 2021
7870632
stability fixes, added stress test
DellaBitta Oct 26, 2021
da5a3c1
desktop stubs
DellaBitta Oct 26, 2021
1138457
Android/iOS both work for fullscreen and adlistener callbacks.
DellaBitta Oct 28, 2021
a7c0617
BannerView destroy, added to itests
DellaBitta Oct 29, 2021
0351c5d
lint fixes
DellaBitta Oct 29, 2021
09c41f6
Documentation comments for PrecisionType enum
DellaBitta Oct 29, 2021
425316c
admob/integration_test/src/integration_test.cc
DellaBitta Oct 29, 2021
736d198
remove flake from alreadyinitialized test
DellaBitta Oct 29, 2021
88a642a
format
DellaBitta Oct 29, 2021
fb65071
assert on null future result ptr
DellaBitta Oct 30, 2021
fa9ff2d
double init logging
DellaBitta Oct 30, 2021
d79ba4a
mutex inits
DellaBitta Oct 30, 2021
8c6c4d6
bannerview mutex
DellaBitta Oct 30, 2021
2bfb6db
revert itest debug output
DellaBitta Oct 31, 2021
dbdc38e
interstitial mutex
DellaBitta Oct 31, 2021
d6e1050
comment / formatting pass
DellaBitta Oct 31, 2021
4e5c7b9
interstitial uninitialized checks
DellaBitta Nov 1, 2021
633d167
fixed missing itest line.
DellaBitta Nov 1, 2021
53ba827
guard bannerview getlastresult use from returning a faulty loadAdResult
DellaBitta Nov 1, 2021
0afef99
AdResult::kUndefinedDomain now const char* const
DellaBitta Nov 1, 2021
352a790
Format .java files
DellaBitta Nov 1, 2021
cd95460
Removed LoadAdResultInternal. Now simply shares AdResultInternal struct
DellaBitta Nov 1, 2021
e87ae0a
load_ad_result_stub save error
DellaBitta Nov 1, 2021
db7c046
remove accidental change to reference_counted_future_impl.h
DellaBitta Nov 1, 2021
051d3e8
use of stringWithFormat in adapter_response. CompleteFuture now uses…
DellaBitta Nov 1, 2021
8cf3960
merge feature/admob_2021_adresult
DellaBitta Nov 1, 2021
16837e0
merged feature/admob_2021
DellaBitta Nov 1, 2021
5a9e5d7
create future replacement
DellaBitta Nov 3, 2021
74c6594
banner view wait for listeners in itest
DellaBitta Nov 3, 2021
09d8c7c
Ad Clicked fix, Android link error. (#735)
DellaBitta Nov 4, 2021
a6829e4
removed keyvalue pair from types.h
DellaBitta Nov 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Android/firebase_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil;
// A map of library to the dependencies that need to be added for it.
def firebaseDependenciesMap = [
'app' : ['com.google.firebase:firebase-analytics:19.0.0'],
'admob' : ['com.google.firebase:firebase-ads:20.1.0',
'admob' : ['com.google.firebase:firebase-ads:20.4.0',
'com.google.android.gms:play-services-measurement-sdk-api:19.0.0',
'com.google.android.gms:play-services-base:17.6.0'],
'analytics' : ['com.google.firebase:firebase-analytics:19.0.0',
Expand Down
18 changes: 15 additions & 3 deletions admob/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,35 @@ binary_to_array("admob_resources"
set(android_SRCS
${admob_resources_source}
src/android/ad_request_converter.cc
src/android/ad_result_android.cc
src/android/adapter_response_info_android.cc
src/android/admob_android.cc
src/android/banner_view_internal_android.cc
src/android/interstitial_ad_internal_android.cc)
src/android/interstitial_ad_internal_android.cc
src/android/load_ad_result_android.cc
src/android/response_info_android.cc)

# Source files used by the iOS implementation.
set(ios_SRCS
src/ios/FADAdSize.mm
src/ios/FADBannerView.mm
src/ios/FADInterstitialDelegate.mm
src/ios/FADRequest.mm
src/ios/ad_result_ios.mm
src/ios/adapter_response_info_ios.mm
src/ios/admob_ios.mm
src/ios/banner_view_internal_ios.mm
src/ios/interstitial_ad_internal_ios.mm)
src/ios/interstitial_ad_internal_ios.mm
src/ios/load_ad_result_ios.mm
src/ios/response_info_ios.mm)

# Source files used by the stub implementation.
set(stub_SRCS
src/stub/admob_stub.cc)
src/stub/ad_result_stub.cc
src/stub/adapter_response_info_stub.cc
src/stub/admob_stub.cc
src/stub/load_ad_result_stub.cc
src/stub/response_info_stub.cc)

if(ANDROID)
set(admob_platform_SRCS
Expand Down
2 changes: 1 addition & 1 deletion admob/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'

target 'integration_test' do
pod 'Firebase/Analytics', '8.5.0'
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk'
pod 'Google-Mobile-Ads-SDK', '8.12.0'
end

post_install do |installer|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 529226C91C85F68000C89379;
Expand Down Expand Up @@ -289,6 +290,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
EXCLUDED_ARCHS = i386;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -303,6 +305,7 @@
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
);
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
WRAPPER_EXTENSION = app;
Expand All @@ -317,6 +320,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
EXCLUDED_ARCHS = i386;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -331,6 +335,7 @@
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
);
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
WRAPPER_EXTENSION = app;
Expand Down
Loading