react-native-google-mobile-ads 15.8.3 → 16.0.0

package/__tests__/consent.test.ts

@@ -4,28 +4,28 @@ describe('Google Mobile Ads AdsConsent', function () {
   describe('requestInfoUpdate', function () {
     it('throws if options are not an object', function () {
       // @ts-ignore
-      expect(() => AdsConsent.requestInfoUpdate('123')).toThrowError(
+      expect(() => AdsConsent.requestInfoUpdate('123')).toThrow(
         "AdsConsent.requestInfoUpdate(*) 'options' expected an object value.",
       );
     });
 
     it('throws if options.debugGeography is not a valid value.', function () {
       // @ts-ignore
-      expect(() => AdsConsent.requestInfoUpdate({ debugGeography: -1 })).toThrowError(
+      expect(() => AdsConsent.requestInfoUpdate({ debugGeography: -1 })).toThrow(
         "AdsConsent.requestInfoUpdate(*) 'options.debugGeography' expected one of AdsConsentDebugGeography.DISABLED, AdsConsentDebugGeography.EEA, AdsConsentDebugGeography.NOT_EEA, AdsConsentDebugGeography.REGULATED_US_STATE or AdsConsentDebugGeography.OTHER.",
       );
     });
 
     it('throws if options.tagForUnderAgeOfConsent is not a boolean.', function () {
       // @ts-ignore
-      expect(() => AdsConsent.requestInfoUpdate({ tagForUnderAgeOfConsent: '123' })).toThrowError(
+      expect(() => AdsConsent.requestInfoUpdate({ tagForUnderAgeOfConsent: '123' })).toThrow(
         "AdsConsent.requestInfoUpdate(*) 'options.tagForUnderAgeOfConsent' expected a boolean value.",
       );
     });
 
     it('throws if options.testDeviceIdentifiers is not an array', function () {
       // @ts-ignore
-      expect(() => AdsConsent.requestInfoUpdate({ testDeviceIdentifiers: '123' })).toThrowError(
+      expect(() => AdsConsent.requestInfoUpdate({ testDeviceIdentifiers: '123' })).toThrow(
         "AdsConsent.requestInfoUpdate(*) 'options.testDeviceIdentifiers' expected an array of string values.",
       );
     });

package/__tests__/googleMobileAds.test.ts

@@ -5,7 +5,7 @@ describe('Admob', function () {
   describe('setRequestConfiguration()', function () {
     it('throws if config is not an object', function () {
       // @ts-ignore
-      expect(() => admob().setRequestConfiguration('123')).toThrowError(
+      expect(() => admob().setRequestConfiguration('123')).toThrow(
         "setRequestConfiguration(*) 'requestConfiguration' expected an object value",
       );
     });
@@ -16,8 +16,8 @@ describe('Admob', function () {
           admob().setRequestConfiguration({
             maxAdContentRating: 'Y' as MaxAdContentRating,
           }),
-        ).toThrowError(
-          "setRequestConfiguration(*) 'requestConfiguration.maxAdContentRating' expected on of MaxAdContentRating.G, MaxAdContentRating.PG, MaxAdContentRating.T or MaxAdContentRating.MA",
+        ).toThrow(
+          "setRequestConfiguration(*) 'requestConfiguration.maxAdContentRating' expected one of G, PG, T, MA",
         );
       });
     });
@@ -29,7 +29,7 @@ describe('Admob', function () {
             // @ts-ignore
             tagForChildDirectedTreatment: 'true',
           }),
-        ).toThrowError(
+        ).toThrow(
           "setRequestConfiguration(*) 'requestConfiguration.tagForChildDirectedTreatment' expected a boolean value",
         );
       });
@@ -42,7 +42,7 @@ describe('Admob', function () {
             // @ts-ignore
             tagForUnderAgeOfConsent: 'false',
           }),
-        ).toThrowError(
+        ).toThrow(
           "setRequestConfiguration(*) 'requestConfiguration.tagForUnderAgeOfConsent' expected a boolean value",
         );
       });
@@ -55,7 +55,7 @@ describe('Admob', function () {
             // @ts-ignore
             testDeviceIdentifiers: 'EMULATOR',
           }),
-        ).toThrowError(
+        ).toThrow(
           "setRequestConfiguration(*) 'requestConfiguration.testDeviceIdentifiers' expected an array value",
         );
       });
@@ -64,44 +64,44 @@ describe('Admob', function () {
     describe('testDebugMenu', function () {
       it('does call native initialize method', () => {
         admob().initialize();
-        expect(RNGoogleMobileAdsModule.initialize).toBeCalledTimes(1);
+        expect(RNGoogleMobileAdsModule.initialize).toHaveBeenCalledTimes(1);
       });
 
       it('does call native setRequestConfiguration method', () => {
         admob().setRequestConfiguration({ tagForChildDirectedTreatment: true });
-        expect(RNGoogleMobileAdsModule.setRequestConfiguration).toBeCalledTimes(1);
+        expect(RNGoogleMobileAdsModule.setRequestConfiguration).toHaveBeenCalledTimes(1);
       });
 
       it('does call native openAdInspector method', () => {
         admob().openAdInspector();
-        expect(RNGoogleMobileAdsModule.openAdInspector).toBeCalledTimes(1);
+        expect(RNGoogleMobileAdsModule.openAdInspector).toHaveBeenCalledTimes(1);
       });
 
       it('does call native openDebugMenu method', () => {
         admob().openDebugMenu('12345');
-        expect(RNGoogleMobileAdsModule.openDebugMenu).toBeCalledTimes(1);
+        expect(RNGoogleMobileAdsModule.openDebugMenu).toHaveBeenCalledTimes(1);
       });
 
       it('throws if adUnit is empty', function () {
         expect(() => {
           admob().openDebugMenu('');
-        }).toThrowError('openDebugMenu expected a non-empty string value');
+        }).toThrow('openDebugMenu expected a non-empty string value');
       });
 
       it('does call native setAppVolume method', () => {
         admob().setAppVolume(0.5);
-        expect(RNGoogleMobileAdsModule.setAppVolume).toBeCalledTimes(1);
+        expect(RNGoogleMobileAdsModule.setAppVolume).toHaveBeenCalledTimes(1);
       });
 
       it('throws if setAppVolume is greater than 1', function () {
         expect(() => {
           admob().setAppVolume(2);
-        }).toThrowError('The app volume must be a value between 0 and 1 inclusive.');
+        }).toThrow('The app volume must be a value between 0 and 1 inclusive.');
       });
 
       it('does call native setAppMuted method', () => {
         admob().setAppMuted(true);
-        expect(RNGoogleMobileAdsModule.setAppMuted).toBeCalledTimes(1);
+        expect(RNGoogleMobileAdsModule.setAppMuted).toHaveBeenCalledTimes(1);
       });
     });
   });

package/__tests__/interstitial.test.ts

@@ -5,14 +5,14 @@ describe('Google Mobile Ads Interstitial', function () {
   describe('createForAdRequest', function () {
     it('throws if adUnitId is invalid', function () {
       // @ts-ignore
-      expect(() => InterstitialAd.createForAdRequest(123)).toThrowError(
+      expect(() => InterstitialAd.createForAdRequest(123)).toThrow(
         "'adUnitId' expected an string value",
       );
     });
 
     it('throws if requestOptions are invalid', function () {
       // @ts-ignore
-      expect(() => InterstitialAd.createForAdRequest('123', 123)).toThrowError(
+      expect(() => InterstitialAd.createForAdRequest('123', 123)).toThrow(
         "InterstitialAd.createForAdRequest(_, *) 'options' expected an object value.",
       );
     });
@@ -34,17 +34,17 @@ describe('Google Mobile Ads Interstitial', function () {
         const ad = InterstitialAd.createForAdRequest('abc');
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(1);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(1);
       });
 
       it('does nothing if ad currently loading', () => {
         const ad = InterstitialAd.createForAdRequest('abc');
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(1);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(1);
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(1);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(1);
       });
 
       it('does nothing if ad is already loaded', () => {
@@ -54,33 +54,33 @@ describe('Google Mobile Ads Interstitial', function () {
         ad._handleAdEvent({ body: { type: AdEventType.LOADED } });
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).not.toBeCalled();
+        expect(NativeInterstitialModule.interstitialLoad).not.toHaveBeenCalled();
       });
 
       it('can be called again after ad was closed', () => {
         const ad = InterstitialAd.createForAdRequest('abc');
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(1);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(1);
 
         // @ts-ignore
         ad._handleAdEvent({ body: { type: AdEventType.CLOSED } });
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(2);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(2);
       });
 
       it('can be called again after ad failed to load', () => {
         const ad = InterstitialAd.createForAdRequest('abc');
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(1);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(1);
 
         // @ts-ignore
         ad._handleAdEvent({ body: { type: AdEventType.ERROR } });
 
         ad.load();
-        expect(NativeInterstitialModule.interstitialLoad).toBeCalledTimes(2);
+        expect(NativeInterstitialModule.interstitialLoad).toHaveBeenCalledTimes(2);
       });
     });
 
@@ -88,7 +88,7 @@ describe('Google Mobile Ads Interstitial', function () {
       it('throws if showing before loaded', function () {
         const i = InterstitialAd.createForAdRequest('abc');
 
-        expect(() => i.show()).toThrowError(
+        expect(() => i.show()).toThrow(
           'The requested InterstitialAd has not loaded and could not be shown',
         );
       });
@@ -99,7 +99,7 @@ describe('Google Mobile Ads Interstitial', function () {
         const i = InterstitialAd.createForAdRequest('abc');
 
         // @ts-ignore
-        expect(() => i.addAdEventsListener('foo')).toThrowError("'listener' expected a function");
+        expect(() => i.addAdEventsListener('foo')).toThrow("'listener' expected a function");
       });
 
       it('returns an unsubscriber function', function () {
@@ -115,7 +115,7 @@ describe('Google Mobile Ads Interstitial', function () {
         const i = InterstitialAd.createForAdRequest('abc');
 
         // @ts-ignore
-        expect(() => i.addAdEventListener('foo')).toThrowError(
+        expect(() => i.addAdEventListener('foo')).toThrow(
           "'type' expected a valid event type value.",
         );
       });
@@ -124,7 +124,7 @@ describe('Google Mobile Ads Interstitial', function () {
         const i = InterstitialAd.createForAdRequest('abc');
 
         // @ts-ignore
-        expect(() => i.addAdEventListener(AdEventType.LOADED, 'foo')).toThrowError(
+        expect(() => i.addAdEventListener(AdEventType.LOADED, 'foo')).toThrow(
           "'listener' expected a function",
         );
       });

package/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsModule.kt

@@ -32,18 +32,6 @@ class ReactNativeGoogleMobileAdsModule(
 
   override fun getName() = NAME
 
-  override fun getConstants(): Map<String, Any> {
-    return mapOf(
-        // Precision types in ad revenue events.
-        // See:
-        // https://developers.google.com/android/reference/com/google/android/gms/ads/AdValue.PrecisionType
-        "REVENUE_PRECISION_UNKNOWN" to AdValue.PrecisionType.UNKNOWN,
-        "REVENUE_PRECISION_ESTIMATED" to AdValue.PrecisionType.ESTIMATED,
-        "REVENUE_PRECISION_PUBLISHER_PROVIDED" to AdValue.PrecisionType.PUBLISHER_PROVIDED,
-        "REVENUE_PRECISION_PRECISE" to AdValue.PrecisionType.PRECISE
-    )
-  }
-
   private fun buildRequestConfiguration(
     requestConfiguration: ReadableMap
   ): RequestConfiguration {

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h

@@ -30,7 +30,7 @@
 @property(nonatomic, copy) NSDictionary *sizeConfig;
 @property(nonatomic, copy) NSString *unitId;
 @property(nonatomic, copy) NSDictionary *request;
-@property(nonatomic, copy) NSNumber *manualImpressionsEnabled;
+@property(nonatomic, assign) BOOL manualImpressionsEnabled;
 @property(nonatomic, assign) BOOL propsChanged;
 
 @property(nonatomic, copy) RCTBubblingEventBlock onNativeEvent;

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m

@@ -51,7 +51,7 @@
 
     ((GAMBannerView *)_banner).validAdSizes = _sizeConfig[@"sizes"];
     ((GAMBannerView *)_banner).appEventDelegate = self;
-    ((GAMBannerView *)_banner).enableManualImpressions = [_manualImpressionsEnabled boolValue];
+    ((GAMBannerView *)_banner).enableManualImpressions = _manualImpressionsEnabled;
   } else {
     _banner = [[GADBannerView alloc] initWithAdSize:adSize];
   }
@@ -97,8 +97,8 @@
   _propsChanged = true;
 }
 
-- (void)setManualImpressionsEnabled:(BOOL *)manualImpressionsEnabled {
-  _manualImpressionsEnabled = [NSNumber numberWithBool:manualImpressionsEnabled];
+- (void)setManualImpressionsEnabled:(BOOL)manualImpressionsEnabled {
+  _manualImpressionsEnabled = manualImpressionsEnabled;
   _propsChanged = true;
 }
 

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.h

@@ -23,50 +23,50 @@
 
 @interface RNGoogleMobileAdsCommon : NSObject
 
-+ (GAMRequest *)buildAdRequest:(NSDictionary *)adRequestOptions;
++ (GAMRequest *_Nonnull)buildAdRequest:(NSDictionary *_Nonnull)adRequestOptions;
 
-+ (NSDictionary *)getCodeAndMessageFromAdError:(NSError *)error;
++ (NSDictionary *_Nonnull)getCodeAndMessageFromAdError:(NSError *_Nonnull)error;
 
-+ (void)sendAdEvent:(NSString *)event
-          requestId:(NSNumber *)requestId
-               type:(NSString *)type
-           adUnitId:(NSString *)adUnitId
++ (void)sendAdEvent:(NSString *_Nonnull)event
+          requestId:(NSNumber *_Nonnull)requestId
+               type:(NSString *_Nonnull)type
+           adUnitId:(NSString *_Nonnull)adUnitId
               error:(nullable NSDictionary *)error
                data:(nullable NSDictionary *)data;
 
-+ (GADAdSize)stringToAdSize:(NSString *)value
++ (GADAdSize)stringToAdSize:(NSString *_Nonnull)value
               withMaxHeight:(CGFloat)maxHeight
                    andWidth:(CGFloat)adWidth;
 
-+ (BOOL)isAdManagerUnit:(NSString *)unitId;
++ (BOOL)isAdManagerUnit:(NSString *_Nonnull)unitId;
 
 + (nullable UIViewController *)currentViewController;
 
 @end
 
 @interface RNGADInterstitial : GADInterstitialAd
-@property(nonatomic) NSNumber *requestId;
-- (void)setRequestId:(NSNumber *)requestId;
+@property(nonatomic) NSNumber *_Nonnull requestId;
+- (void)setRequestId:(NSNumber *_Nonnull)requestId;
 @end
 
 @interface RNGADRewarded : GADRewardedAd
-@property(nonatomic) NSNumber *requestId;
-- (void)setRequestId:(NSNumber *)requestId;
+@property(nonatomic) NSNumber *_Nonnull requestId;
+- (void)setRequestId:(NSNumber *_Nonnull)requestId;
 @end
 
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_APP_OPEN;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_APP_OPEN;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_REWARDED;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL;
 
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_LOADED;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_ERROR;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_OPENED;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_CLICKED;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_CLOSED;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_APP_EVENT;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_LOADED;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_ERROR;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_OPENED;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_CLICKED;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_CLOSED;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_APP_EVENT;
 
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_LOADED;
-extern NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_REWARDED_LOADED;
+extern NSString *_Nonnull const GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD;
 
 #endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsConsentModule.mm

@@ -190,7 +190,7 @@ RCT_EXPORT_METHOD(getPurposeLegitimateInterests
       ? ^{
           NSMutableArray *array = [[NSMutableArray alloc] init];
           FB::LazyVector<NSString *, id> identifiers = options.testDeviceIdentifiers().value();
-          for (NSUInteger i = 0; i < identifiers.size(); i++) {
+          for (int i = 0; i < identifiers.size(); i++) {
               [array addObject:identifiers[i]];  // Direct access by index
           }
           return array;

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsMediaView.h

@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 #ifdef RCT_NEW_ARCH_ENABLED
 @interface RNGoogleMobileAdsMediaView : RCTViewComponentView
 
+// this setters/getters here are provided by RCTViewComponentView super, we just narrow the type.
 @property(nonatomic, strong, nullable) GADMediaView *contentView;
 #else
 @interface RNGoogleMobileAdsMediaView : GADMediaView

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsMediaView.mm

@@ -48,6 +48,8 @@ using namespace facebook::react;
 #ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric specific
 
+@dynamic contentView;  // provided by superclass, but we narrow the type in our declaration
+
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const RNGoogleMobileAdsBannerViewProps>();

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsModule.mm

@@ -71,13 +71,13 @@ RCT_EXPORT_METHOD(openDebugMenu : (NSString *)adUnit) {
 #endif
 }
 
-RCT_EXPORT_METHOD(setAppVolume : (float)volume) {
+RCT_EXPORT_METHOD(setAppVolume : (double)volume) {
 #if !TARGET_OS_MACCATALYST
   GADMobileAds.sharedInstance.applicationVolume = volume;
 #endif
 }
 
-RCT_EXPORT_METHOD(setAppMuted : (BOOL *)muted) {
+RCT_EXPORT_METHOD(setAppMuted : (BOOL)muted) {
 #if !TARGET_OS_MACCATALYST
   GADMobileAds.sharedInstance.applicationMuted = muted;
 #endif
@@ -165,7 +165,9 @@ RCT_EXPORT_METHOD(setAppMuted : (BOOL *)muted) {
                                  rejectPromiseWithUserInfo:reject
                                                   userInfo:[@{
                                                     @"code" : [NSString
-                                                        stringWithFormat:@"CODE_%d", error.code],
+                                                        stringWithFormat:@"CODE_%ld",
+                                                                         static_cast<long>(
+                                                                             error.code)],
                                                     @"message" : error.description,
                                                   } mutableCopy]];
                            } else {
@@ -175,21 +177,4 @@ RCT_EXPORT_METHOD(setAppMuted : (BOOL *)muted) {
 #endif
 }
 
-- (NSDictionary *)constantsToExport {
-  return @{
-  // Precision types in ad revenue events.
-  // See: https://developers.google.com/admob/ios/impression-level-ad-revenue#objective-c
-#if !TARGET_OS_MACCATALYST
-    @"REVENUE_PRECISION_UNKNOWN" : @(GADAdValuePrecisionUnknown),
-    @"REVENUE_PRECISION_ESTIMATED" : @(GADAdValuePrecisionEstimated),
-    @"REVENUE_PRECISION_PUBLISHER_PROVIDED" : @(GADAdValuePrecisionPublisherProvided),
-    @"REVENUE_PRECISION_PRECISE" : @(GADAdValuePrecisionPrecise)
-  };
-#endif
-}
-
-- (NSDictionary *)getConstants {
-  return [self constantsToExport];
-}
-
 @end

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeModule.mm

@@ -145,7 +145,7 @@ RCT_EXPORT_METHOD(destroy
 
 - (instancetype)initWithNativeModule:(RNGoogleMobileAdsNativeModule *)nativeModule
                             adUnitId:(NSString *)adUnitId
-                      requestOptions:(NSDictionary *)requestOptions {
+                      requestOptions:(NSDictionary *_Nonnull)requestOptions {
   if (self = [super init]) {
     _nativeModule = nativeModule;
 

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeView.h

@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 #ifdef RCT_NEW_ARCH_ENABLED
 @interface RNGoogleMobileAdsNativeView : RCTViewComponentView
 
+// provided by superclass, but we narrow the type in our declaration
 @property(nonatomic, strong, nullable) GADNativeAdView *contentView;
 #else
 @interface RNGoogleMobileAdsNativeView : GADNativeAdView

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeView.mm

@@ -50,6 +50,8 @@ using namespace facebook::react;
 #ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric specific
 
+@dynamic contentView;  // provided by superclass, but we narrow the type in our declaration
+
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const RNGoogleMobileAdsNativeViewProps>();

package/ios/RNGoogleMobileAds/common/RNSharedUtils.h

@@ -36,8 +36,7 @@
 #pragma mark -
 #pragma mark Methods
 
-+ (void)rejectPromiseWithUserInfo:(RCTPromiseRejectBlock)reject
-                         userInfo:(NSMutableDictionary *)userInfo;
++ (void)rejectPromiseWithUserInfo:(RCTPromiseRejectBlock)reject userInfo:(NSDictionary *)userInfo;
 
 @end
 

package/ios/RNGoogleMobileAds/common/RNSharedUtils.mm

@@ -26,8 +26,7 @@ static NSString *const RNErrorDomain = @"RNErrorDomain";
 #pragma mark -
 #pragma mark Methods
 
-+ (void)rejectPromiseWithUserInfo:(RCTPromiseRejectBlock)reject
-                         userInfo:(NSMutableDictionary *)userInfo {
++ (void)rejectPromiseWithUserInfo:(RCTPromiseRejectBlock)reject userInfo:(NSDictionary *)userInfo {
   NSError *error = [NSError errorWithDomain:RNErrorDomain code:666 userInfo:userInfo];
   reject(userInfo[@"code"], userInfo[@"message"], error);
 }

package/ios_config.sh

@@ -48,8 +48,8 @@ _PLIST_ENTRY_TYPES=()
 _PLIST_ENTRY_VALUES=()
 
 function setPlistValue {
-  echo "info:      setting plist entry '$1' of type '$2' in file '$4'"
-  ${_PLIST_BUDDY} -c "Add :$1 $2 '$3'" $4 || echo "info:      '$1' already exists"
+  echo "note:      setting plist entry '$1' of type '$2' in file '$4'"
+  ${_PLIST_BUDDY} -c "Add :$1 $2 '$3'" $4 || echo "note:      '$1' already exists"
 }
 
 function getJsonKeyValue () {
@@ -69,8 +69,8 @@ function jsonBoolToYesNo () {
   fi
 }
 
-echo "info: -> ${_PROJECT_ABBREVIATION} build script started"
-echo "info: 1) Locating ${_JSON_FILE_NAME} file:"
+echo "note: -> ${_PROJECT_ABBREVIATION} build script started"
+echo "note: 1) Locating ${_JSON_FILE_NAME} file:"
 
 if [[ -z ${_CURRENT_SEARCH_DIR} ]]; then
   _CURRENT_SEARCH_DIR=$(pwd)
@@ -78,11 +78,12 @@ fi;
 
 while true; do
   _CURRENT_SEARCH_DIR=$(dirname "$_CURRENT_SEARCH_DIR")
+  if [[ "$_CURRENT_SEARCH_DIR" == *.generated ]]; then continue; fi
   if [[ "$_CURRENT_SEARCH_DIR" == "/" ]] || [[ ${_CURRENT_LOOKUPS} -gt ${_MAX_LOOKUPS} ]]; then break; fi;
-  echo "info:      ($_CURRENT_LOOKUPS of $_MAX_LOOKUPS) Searching in '$_CURRENT_SEARCH_DIR' for a ${_JSON_FILE_NAME} file."
+  echo "note:      ($_CURRENT_LOOKUPS of $_MAX_LOOKUPS) Searching in '$_CURRENT_SEARCH_DIR' for a ${_JSON_FILE_NAME} file."
   _SEARCH_RESULT=$(find "$_CURRENT_SEARCH_DIR" -maxdepth 2 -name ${_JSON_FILE_NAME} -print | /usr/bin/head -n 1)
   if [[ ${_SEARCH_RESULT} ]]; then
-    echo "info:      ${_JSON_FILE_NAME} found at $_SEARCH_RESULT"
+    echo "note:      ${_JSON_FILE_NAME} found at $_SEARCH_RESULT"
     break;
   fi;
   _CURRENT_LOOKUPS=$((_CURRENT_LOOKUPS+1))
@@ -93,7 +94,7 @@ if [[ ${_SEARCH_RESULT} ]]; then
   _RN_ROOT_EXISTS=$(ruby -KU -e "require 'rubygems';require 'json'; output=JSON.parse('$_JSON_OUTPUT_RAW'); puts output[$_JSON_ROOT]" || echo '')
 
   if [[ ${_RN_ROOT_EXISTS} ]]; then
-    if ! python3 --version >/dev/null 2>&1; then echo "python3 not found, app.json file processing error." && exit 1; fi
+    if ! python3 --version >/dev/null 2>&1; then echo "error: python3 not found, app.json file processing error." && exit 1; fi
     _JSON_OUTPUT_BASE64=$(python3 -c 'import json,sys,base64;print(base64.b64encode(bytes(json.dumps(json.loads(open('"'${_SEARCH_RESULT}'"', '"'rb'"').read())['${_JSON_ROOT}']), '"'utf-8'"')).decode())' || echo "e30=")
   fi
 
@@ -147,10 +148,10 @@ else
   _PLIST_ENTRY_KEYS+=("google_mobile_ads_json_raw")
   _PLIST_ENTRY_TYPES+=("string")
   _PLIST_ENTRY_VALUES+=("$_JSON_OUTPUT_BASE64")
-  echo "warning:   A ${_JSON_FILE_NAME} file was not found, whilst this file is optional it is recommended to include it to auto-configure services."
+  echo "note:   An ${_JSON_FILE_NAME} file was not found, whilst this file is optional it is recommended to include it to auto-configure services."
 fi;
 
-echo "info: 2) Injecting Info.plist entries: "
+echo "note: 2) Injecting Info.plist entries: "
 
 # Log out the keys we're adding
 for i in "${!_PLIST_ENTRY_KEYS[@]}"; do
@@ -163,8 +164,7 @@ if ! [[ -f "${_TARGET_PLIST}" ]]; then
 fi
 
 if ! [[ $_IOS_APP_ID ]]; then
-  echo "warning: ios_app_id key not found in react-native-google-mobile-ads key in app.json. App will crash without it."
-  echo "         You can safely ignore this warning if you are using our Expo config plugin."
+  echo "warning:  ios_app_id key not found in react-native-google-mobile-ads key in app.json. App will crash without it. You may safely ignore this warning if you are using our Expo config plugin."
   exit 0
 fi
 
@@ -189,4 +189,4 @@ for plist in "${_TARGET_PLIST}" "${_DSYM_PLIST}" ; do
   fi
 done
 
-echo "info: <- ${_PROJECT_ABBREVIATION} build script finished"
+echo "note: <- ${_PROJECT_ABBREVIATION} build script finished"

package/jest.setup.ts

@@ -57,3 +57,13 @@ jest.doMock('./src/specs/components/GoogleMobileAdsNativeViewNativeComponent', (
     default: ReactNative.View,
   };
 });
+jest.doMock('./src/specs/modules/NativeInterstitialModule', () => {
+  return {
+    __esModule: true,
+    Commands: {},
+    default: {
+      interstitialLoad: jest.fn(),
+      interstitialShow: jest.fn(),
+    },
+  };
+});

package/lib/commonjs/AdEventType.js

@@ -21,11 +21,51 @@ exports.AdEventType = void 0;
  *
  */
 let AdEventType = exports.AdEventType = /*#__PURE__*/function (AdEventType) {
+  /**
+   * When an ad has loaded. At this point, the ad is ready to be shown to the user.
+   *
+   * #### Example
+   *
+   * ```js
+   * import { AdEventType } from 'react-native-google-mobile-ads';
+   *
+   * advert.addEventListener(AdEventType.LOADED, () => {
+   *   advert.show();
+   * });
+   * ```
+   */
   AdEventType["LOADED"] = "loaded";
+  /**
+   * The ad has thrown an error. See the error parameter the listener callback for more information.
+   *
+   * #### Example
+   *
+   * ```js
+   * import { AdEventType } from 'react-native-google-mobile-ads';
+   *
+   * advert.addEventListener(AdEventType.ERROR, (error) => {
+   *   console.log('Ad error:', error);
+   * });
+   * ```
+   */
   AdEventType["ERROR"] = "error";
+  /**
+   * The ad opened and is currently visible to the user. This event is fired after the `show()`
+   * method has been called.
+   */
   AdEventType["OPENED"] = "opened";
+  /**
+   * Called when ad generates revenue.
+   * See: https://developers.google.com/admob/android/impression-level-ad-revenue
+   */
   AdEventType["PAID"] = "paid";
+  /**
+   * The user clicked the advert.
+   */
   AdEventType["CLICKED"] = "clicked";
+  /**
+   * The user closed the ad and has returned back to your application.
+   */
   AdEventType["CLOSED"] = "closed";
   return AdEventType;
 }({});

package/lib/commonjs/AdEventType.js.map

@@ -1 +1 @@
-{"version":3,"names":["AdEventType","exports"],"sourceRoot":"../../src","sources":["AdEventType.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAfA,IAiBYA,WAAW,GAAAC,OAAA,CAAAD,WAAA,0BAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA","ignoreList":[]}
+{"version":3,"names":["AdEventType","exports"],"sourceRoot":"../../src","sources":["AdEventType.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAfA,IAiBYA,WAAW,GAAAC,OAAA,CAAAD,WAAA,0BAAXA,WAAW;EACrB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EAbYA,WAAW;EAgBrB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EA5BYA,WAAW;EA+BrB;AACF;AACA;AACA;EAlCYA,WAAW;EAqCrB;AACF;AACA;AACA;EAxCYA,WAAW;EA2CrB;AACF;AACA;EA7CYA,WAAW;EAgDrB;AACF;AACA;EAlDYA,WAAW;EAAA,OAAXA,WAAW;AAAA","ignoreList":[]}