Merge pull request #91 from vijaysingh-axway/TIMOB-27389

chore(ios): updated admob sdk to 7.49.0

ios/documentation/changelog.md

@@ -1,5 +1,6 @@
 # Change Log
 <pre>
+v2.5.0 Updated to Admob iOS  SDK  to 7.49.0
 v2.4.0  Support the Facebook Audience Network adapter
         iOS integration guide: https://developers.google.com/admob/ios/mediation/facebook
 

ios/documentation/index.md

@@ -16,7 +16,9 @@ The Google AdMob Ads SDK has the following requirements:
 * An AdMob site ID.
 * Xcode 6.4 or later.
 * Runtime of iOS 7.1 or later.
-
+* If using module 2.5.0+, add following key in tiapp.xml, inside ios plist  section.   
+    <key>GADIsAdManagerApp</key>
+    <true/>
 ## Accessing the Ti.Admob Module
 
 To access this module from JavaScript, you would do the following:

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.4.0
+version: 2.5.0
 architectures:  armv7 i386 x86_64 arm64
 description: AdMob module for ad delivery via AdMob
 author: Jeff Haynie, Stephen Tramer, Jasper Kennis, Jon Alter and Hans Knoechel

ios/platform/GoogleMobileAds.framework/Headers/DFPBannerView.h

@@ -2,49 +2,48 @@
 //  DFPBannerView.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2012 Google Inc. All rights reserved.
+//  Copyright 2012 Google LLC. All rights reserved.
 //
 
 #import <GoogleMobileAds/DFPCustomRenderedBannerViewDelegate.h>
+#import <GoogleMobileAds/GADAdLoader.h>
 #import <GoogleMobileAds/GADAdLoaderDelegate.h>
 #import <GoogleMobileAds/GADAppEventDelegate.h>
 #import <GoogleMobileAds/GADBannerView.h>
-#import <GoogleMobileAds/GADCorrelator.h>
 #import <GoogleMobileAds/GADVideoController.h>
 #import <GoogleMobileAds/GoogleMobileAdsDefines.h>
 
-GAD_ASSUME_NONNULL_BEGIN
-
 /// The delegate of a GADAdLoader object must conform to this protocol to receive DFPBannerViews.
-@protocol DFPBannerAdLoaderDelegate<GADAdLoaderDelegate>
+@protocol DFPBannerAdLoaderDelegate <GADAdLoaderDelegate>
 
 /// Asks the delegate which banner ad sizes should be requested.
-- (NSArray<NSValue *> *)validBannerSizesForAdLoader:(GADAdLoader *)adLoader;
+- (nonnull NSArray<NSValue *> *)validBannerSizesForAdLoader:(nonnull GADAdLoader *)adLoader;
 
-/// Tells the delegate that a DFP banner ad was received.
-- (void)adLoader:(GADAdLoader *)adLoader didReceiveDFPBannerView:(DFPBannerView *)bannerView;
+/// Tells the delegate that a Google Ad Manager banner ad was received.
+- (void)adLoader:(nonnull GADAdLoader *)adLoader
+    didReceiveDFPBannerView:(nonnull DFPBannerView *)bannerView;
 
 @end
 
-/// The view that displays DoubleClick For Publishers banner ads.
+/// The view that displays Ad Manager banner ads.
 ///
 /// To request this ad type using GADAdLoader, you need to pass kGADAdLoaderAdTypeDFPBanner (see
 /// GADAdLoaderAdTypes.h) to the |adTypes| parameter in GADAdLoader's initializer method. If you
 /// request this ad type, your delegate must conform to the DFPBannerAdLoaderDelegate protocol.
 @interface DFPBannerView : GADBannerView
 
-/// Required value created on the DFP website. Create a new ad unit for every unique placement of an
-/// ad in your application. Set this to the ID assigned for this placement. Ad units are important
-/// for targeting and statistics.
+/// Required value created on the Ad Manager website. Create a new ad unit for every unique
+/// placement of an ad in your application. Set this to the ID assigned for this placement. Ad units
+/// are important for targeting and statistics.
 ///
-/// Example DFP ad unit ID: @"/6499/example/banner"
-@property(nonatomic, copy, GAD_NULLABLE) NSString *adUnitID;
+/// Example Ad Manager ad unit ID: @"/6499/example/banner"
+@property(nonatomic, copy, nullable) NSString *adUnitID;
 
 /// Optional delegate that is notified when creatives send app events.
-@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id<GADAppEventDelegate> appEventDelegate;
+@property(nonatomic, weak, nullable) IBOutlet id<GADAppEventDelegate> appEventDelegate;
 
 /// Optional delegate that is notified when creatives cause the banner to change size.
-@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id<GADAdSizeDelegate> adSizeDelegate;
+@property(nonatomic, weak, nullable) IBOutlet id<GADAdSizeDelegate> adSizeDelegate;
 
 /// Optional array of NSValue encoded GADAdSize structs, specifying all valid sizes that are
 /// appropriate for this slot. Never create your own GADAdSize directly. Use one of the predefined
@@ -61,21 +60,18 @@ GAD_ASSUME_NONNULL_BEGIN
 ///
 ///   bannerView.validAdSizes = validSizes;
 ///   </pre>
-@property(nonatomic, copy, GAD_NULLABLE) NSArray *validAdSizes;
-
-/// Correlator object for correlating this object to other ad objects.
-@property(nonatomic, strong, GAD_NULLABLE) GADCorrelator *correlator;
+@property(nonatomic, copy, nullable) NSArray<NSValue *> *validAdSizes;
 
 /// Indicates that the publisher will record impressions manually when the ad becomes visible to the
 /// user.
-@property(nonatomic, assign) BOOL enableManualImpressions;
+@property(nonatomic) BOOL enableManualImpressions;
 
 /// Optional delegate object for custom rendered ads.
-@property(nonatomic, weak, GAD_NULLABLE)
-    IBOutlet id<DFPCustomRenderedBannerViewDelegate> customRenderedBannerViewDelegate;
+@property(nonatomic, weak, nullable) IBOutlet id<DFPCustomRenderedBannerViewDelegate>
+    customRenderedBannerViewDelegate;
 
 /// Video controller for controlling video rendered by this ad view.
-@property(nonatomic, strong, readonly) GADVideoController *videoController;
+@property(nonatomic, readonly, nonnull) GADVideoController *videoController;
 
 /// If you've set enableManualImpressions to YES, call this method when the ad is visible.
 - (void)recordImpression;
@@ -87,7 +83,7 @@ GAD_ASSUME_NONNULL_BEGIN
 ///
 /// @param adOptions An array of GADAdLoaderOptions objects. The array is deep copied and option
 /// objects cannot be modified after calling this method.
-- (void)setAdOptions:(NSArray *)adOptions;
+- (void)setAdOptions:(nonnull NSArray<GADAdLoaderOptions *> *)adOptions;
 
 #pragma mark Deprecated
 
@@ -100,11 +96,9 @@ GAD_ASSUME_NONNULL_BEGIN
 ///   <pre>
 ///   GADAdSize size1 = kGADAdSizeBanner;
 ///   GADAdSize size2 = kGADAdSizeLargeBanner;
-///   [bannerView setValidAdSizesWithSizes:&size1, &size2, NULL];
+///   [bannerView setValidAdSizesWithSizes:&size1, &size2, nil];
 ///   </pre>
-- (void)setValidAdSizesWithSizes:(GADAdSize *)firstSize, ... NS_REQUIRES_NIL_TERMINATION
+- (void)setValidAdSizesWithSizes:(nullable GADAdSize *)firstSize, ... NS_REQUIRES_NIL_TERMINATION
                                  GAD_DEPRECATED_MSG_ATTRIBUTE("Use validAdSizes property.");
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/DFPBannerViewOptions.h

@@ -2,28 +2,24 @@
 //  DFPBannerViewOptions.h
 //  Google Mobile Ads SDK
 //
-//  Copyright © 2016 Google Inc. All rights reserved.
+//  Copyright 2016 Google LLC. All rights reserved.
 //
 
 #import <GoogleMobileAds/GADAdLoader.h>
 #import <GoogleMobileAds/GADAdSize.h>
 #import <GoogleMobileAds/GADAdSizeDelegate.h>
 #import <GoogleMobileAds/GADAppEventDelegate.h>
 
-GAD_ASSUME_NONNULL_BEGIN
-
 /// Ad loader options for banner ads.
 @interface DFPBannerViewOptions : GADAdLoaderOptions
 
 /// Optional delegate that is notified if the loaded banner sends app events.
-@property(nonatomic, weak, GAD_NULLABLE) id<GADAppEventDelegate> appEventDelegate;
+@property(nonatomic, weak, nullable) id<GADAppEventDelegate> appEventDelegate;
 
 /// Optional delegate that is notified if the loaded banner changes size.
-@property(nonatomic, weak, GAD_NULLABLE) id<GADAdSizeDelegate> adSizeDelegate;
+@property(nonatomic, weak, nullable) id<GADAdSizeDelegate> adSizeDelegate;
 
 /// Whether the publisher will record impressions manually when the ad becomes visible to the user.
 @property(nonatomic, assign) BOOL enableManualImpressions;
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedAd.h

@@ -2,23 +2,19 @@
 //  DFPCustomRenderedAd.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2014 Google Inc. All rights reserved.
+//  Copyright 2014 Google LLC. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
 
-#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
-
-GAD_ASSUME_NONNULL_BEGIN
-
 /// Custom rendered ad. Your application renders the ad.
 @interface DFPCustomRenderedAd : NSObject
 
 /// The ad's HTML.
-@property(nonatomic, readonly, copy) NSString *adHTML;
+@property(nonatomic, readonly, nonnull) NSString *adHTML;
 
 /// The base URL of the ad's HTML.
-@property(nonatomic, readonly, copy) NSURL *adBaseURL;
+@property(nonatomic, readonly, nonnull) NSURL *adBaseURL;
 
 /// Call this method when the user clicks the ad.
 - (void)recordClick;
@@ -27,8 +23,6 @@ GAD_ASSUME_NONNULL_BEGIN
 - (void)recordImpression;
 
 /// Call this method after the ad has been rendered in a UIView object.
-- (void)finishedRenderingAdView:(UIView *)view;
+- (void)finishedRenderingAdView:(nonnull UIView *)view;
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedBannerViewDelegate.h

@@ -2,27 +2,21 @@
 //  DFPCustomRenderedBannerViewDelegate.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2014 Google Inc. All rights reserved.
+//  Copyright 2014 Google LLC. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
 
-#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
-
 @class DFPBannerView;
 @class DFPCustomRenderedAd;
 
-GAD_ASSUME_NONNULL_BEGIN
-
 /// The DFPCustomRenderedAd banner view delegate protocol for notifying the delegate of changes to
 /// custom rendered banners.
-@protocol DFPCustomRenderedBannerViewDelegate<NSObject>
+@protocol DFPCustomRenderedBannerViewDelegate <NSObject>
 
 /// Called after ad data has been received. You must construct a banner from |customRenderedAd| and
 /// call the |customRenderedAd| object's finishedRenderingAdView: when the ad has been rendered.
-- (void)bannerView:(DFPBannerView *)bannerView
-    didReceiveCustomRenderedAd:(DFPCustomRenderedAd *)customRenderedAd;
+- (void)bannerView:(nonnull DFPBannerView *)bannerView
+    didReceiveCustomRenderedAd:(nonnull DFPCustomRenderedAd *)customRenderedAd;
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedInterstitialDelegate.h

@@ -2,28 +2,23 @@
 //  DFPCustomRenderedInterstitialDelegate.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2014 Google Inc. All rights reserved.
+//  Copyright 2014 Google LLC. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
-
 #import <GoogleMobileAds/GoogleMobileAdsDefines.h>
 
 @class DFPCustomRenderedAd;
 @class DFPInterstitial;
 
-GAD_ASSUME_NONNULL_BEGIN
-
 /// The DFPCustomRenderedAd interstitial delegate protocol for notifying the delegate of changes to
 /// custom rendered interstitials.
-@protocol DFPCustomRenderedInterstitialDelegate<NSObject>
+@protocol DFPCustomRenderedInterstitialDelegate <NSObject>
 
 /// Called after ad data has been received. You must construct an interstitial from
 /// |customRenderedAd| and call the |customRenderedAd| object's finishedRenderingAdView: method when
 /// the ad has been rendered.
-- (void)interstitial:(DFPInterstitial *)interstitial
-    didReceiveCustomRenderedAd:(DFPCustomRenderedAd *)customRenderedAd;
+- (void)interstitial:(nonnull DFPInterstitial *)interstitial
+    didReceiveCustomRenderedAd:(nonnull DFPCustomRenderedAd *)customRenderedAd;
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/DFPInterstitial.h

@@ -2,38 +2,29 @@
 //  DFPInterstitial.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2012 Google Inc. All rights reserved.
+//  Copyright 2012 Google LLC. All rights reserved.
 //
 
 #import <GoogleMobileAds/DFPCustomRenderedInterstitialDelegate.h>
 #import <GoogleMobileAds/GADAppEventDelegate.h>
-#import <GoogleMobileAds/GADCorrelator.h>
 #import <GoogleMobileAds/GADInterstitial.h>
-#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
 
-GAD_ASSUME_NONNULL_BEGIN
-
-/// DoubleClick For Publishers interstitial ad, a full-screen advertisement shown at natural
+/// Google Ad Manager interstitial ad, a full-screen advertisement shown at natural
 /// transition points in your application such as between game levels or news stories.
 @interface DFPInterstitial : GADInterstitial
 
-/// Required value created on the DFP website. Create a new ad unit for every unique placement of an
-/// ad in your application. Set this to the ID assigned for this placement. Ad units are important
-/// for targeting and stats.
+/// Initializes an interstitial with an ad unit created on the Ad Manager website. Create a new ad
+/// unit for every unique placement of an ad in your application. Set this to the ID assigned for
+/// this placement. Ad units are important for targeting and statistics.
 ///
-/// Example DFP ad unit ID: @"/6499/example/interstitial"
-@property(nonatomic, readonly, copy) NSString *adUnitID;
-
-/// Correlator object for correlating this object to other ad objects.
-@property(nonatomic, strong, GAD_NULLABLE) GADCorrelator *correlator;
+/// Example Ad Manager ad unit ID: @"/6499/example/interstitial"
+- (nonnull instancetype)initWithAdUnitID:(nonnull NSString *)adUnitID NS_DESIGNATED_INITIALIZER;
 
 /// Optional delegate that is notified when creatives send app events.
-@property(nonatomic, weak, GAD_NULLABLE) id<GADAppEventDelegate> appEventDelegate;
+@property(nonatomic, weak, nullable) id<GADAppEventDelegate> appEventDelegate;
 
 /// Optional delegate object for custom rendered ads.
-@property(nonatomic, weak, GAD_NULLABLE)
-    id<DFPCustomRenderedInterstitialDelegate> customRenderedInterstitialDelegate;
+@property(nonatomic, weak, nullable) id<DFPCustomRenderedInterstitialDelegate>
+    customRenderedInterstitialDelegate;
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/DFPRequest.h

@@ -2,36 +2,26 @@
 //  DFPRequest.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2014 Google Inc. All rights reserved.
+//  Copyright 2014 Google LLC. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
-
 #import <GoogleMobileAds/GADRequest.h>
 #import <GoogleMobileAds/GoogleMobileAdsDefines.h>
 
-GAD_ASSUME_NONNULL_BEGIN
-
 /// Add this constant to the testDevices property's array to receive test ads on the simulator.
-GAD_EXTERN const id kDFPSimulatorID;
+GAD_EXTERN const id _Nonnull kDFPSimulatorID;
 
 /// Specifies optional parameters for ad requests.
 @interface DFPRequest : GADRequest
 
 /// Publisher provided user ID.
-@property(nonatomic, copy, GAD_NULLABLE) NSString *publisherProvidedID;
+@property(nonatomic, copy, nullable) NSString *publisherProvidedID;
 
 /// Array of strings used to exclude specified categories in ad results.
-@property(nonatomic, copy, GAD_NULLABLE) NSArray *categoryExclusions;
+@property(nonatomic, copy, nullable) NSArray *categoryExclusions;
 
 /// Key-value pairs used for custom targeting.
-@property(nonatomic, copy, GAD_NULLABLE) NSDictionary *customTargeting;
-
-/// This API is deprecated and a no-op, use an instance of GADCorrelator set on DFPInterstitial or
-/// DFPBannerView objects to correlate requests.
-+ (void)updateCorrelator GAD_DEPRECATED_MSG_ATTRIBUTE(
-    "Set GADCorrelator objects on your ads instead. This method no longer affects ad correlation.");
+@property(nonatomic, copy, nullable) NSDictionary *customTargeting;
 
 @end
-
-GAD_ASSUME_NONNULL_END

ios/platform/GoogleMobileAds.framework/Headers/GADAdChoicesView.h

@@ -2,15 +2,11 @@
 //  GADAdChoicesView.h
 //  Google Mobile Ads SDK
 //
-//  Copyright 2016 Google Inc. All rights reserved.
+//  Copyright 2016 Google LLC. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
-#import <GoogleMobileAds/GADNativeAd.h>
 #import <GoogleMobileAds/GoogleMobileAdsDefines.h>
-
-GAD_ASSUME_NONNULL_BEGIN
+#import <UIKit/UIKit.h>
 
 /// Displays AdChoices content.
 ///
@@ -19,7 +15,4 @@ GAD_ASSUME_NONNULL_BEGIN
 /// the GADAdChoicesView. By default, AdChoices is placed in the top right corner of
 /// GADNativeAppInstallAdView and GADNativeContentAdView.
 @interface GADAdChoicesView : UIView
-
 @end
-
-GAD_ASSUME_NONNULL_END