diff --git a/ios/documentation/changelog.md b/ios/documentation/changelog.md index 949e5276..3573afcf 100644 --- a/ios/documentation/changelog.md +++ b/ios/documentation/changelog.md @@ -1,5 +1,6 @@ # Change Log 
+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
 
diff --git a/ios/documentation/index.md b/ios/documentation/index.md
index e96b7df8..0eddabd4 100644
--- a/ios/documentation/index.md
+++ b/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.   
+    GADIsAdManagerApp
+    
 ## Accessing the Ti.Admob Module
 
 To access this module from JavaScript, you would do the following:
diff --git a/ios/manifest b/ios/manifest
index 572b3e5f..28007ff4 100644
--- a/ios/manifest
+++ b/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
diff --git a/ios/platform/GoogleMobileAds.framework/GoogleMobileAds b/ios/platform/GoogleMobileAds.framework/GoogleMobileAds
index ccdfefcc..b15dc1f7 100644
Binary files a/ios/platform/GoogleMobileAds.framework/GoogleMobileAds and b/ios/platform/GoogleMobileAds.framework/GoogleMobileAds differ
diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerView.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerView.h
index 8d328950..3087687d 100644
--- a/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerView.h
+++ b/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 
+#import 
 #import 
 #import 
 #import 
-#import 
 #import 
 #import 
 
-GAD_ASSUME_NONNULL_BEGIN
-
 /// The delegate of a GADAdLoader object must conform to this protocol to receive DFPBannerViews.
-@protocol DFPBannerAdLoaderDelegate
+@protocol DFPBannerAdLoaderDelegate 
 
 /// Asks the delegate which banner ad sizes should be requested.
-- (NSArray *)validBannerSizesForAdLoader:(GADAdLoader *)adLoader;
+- (nonnull NSArray *)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 appEventDelegate;
+@property(nonatomic, weak, nullable) IBOutlet id appEventDelegate;
 
 /// Optional delegate that is notified when creatives cause the banner to change size.
-@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id adSizeDelegate;
+@property(nonatomic, weak, nullable) IBOutlet id 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;
 ///
-@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 *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 customRenderedBannerViewDelegate; +@property(nonatomic, weak, nullable) IBOutlet id + 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 *)adOptions; #pragma mark Deprecated @@ -100,11 +96,9 @@ GAD_ASSUME_NONNULL_BEGIN /// 
 ///   GADAdSize size1 = kGADAdSizeBanner;
 ///   GADAdSize size2 = kGADAdSizeLargeBanner;
-///   [bannerView setValidAdSizesWithSizes:&size1, &size2, NULL];
+///   [bannerView setValidAdSizesWithSizes:&size1, &size2, nil];
 ///
-- (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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerViewOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerViewOptions.h index eff98fbd..ff97dadd 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerViewOptions.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/DFPBannerViewOptions.h @@ -2,7 +2,7 @@ // DFPBannerViewOptions.h // Google Mobile Ads SDK // -// Copyright © 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import @@ -10,20 +10,16 @@ #import #import -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 appEventDelegate; +@property(nonatomic, weak, nullable) id appEventDelegate; /// Optional delegate that is notified if the loaded banner changes size. -@property(nonatomic, weak, GAD_NULLABLE) id adSizeDelegate; +@property(nonatomic, weak, nullable) id 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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedAd.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedAd.h index 5c2b0abb..0c469c8a 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedAd.h +++ b/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 -#import - -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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedBannerViewDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedBannerViewDelegate.h index e15b89eb..22d23075 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedBannerViewDelegate.h +++ b/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 -#import - @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 +@protocol DFPCustomRenderedBannerViewDelegate /// 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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedInterstitialDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedInterstitialDelegate.h index 0f1f4a8a..0df690ef 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/DFPCustomRenderedInterstitialDelegate.h +++ b/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 - #import @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 +@protocol DFPCustomRenderedInterstitialDelegate /// 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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPInterstitial.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPInterstitial.h index e3af0d21..211efb92 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/DFPInterstitial.h +++ b/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 #import -#import #import -#import -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 appEventDelegate; +@property(nonatomic, weak, nullable) id appEventDelegate; /// Optional delegate object for custom rendered ads. -@property(nonatomic, weak, GAD_NULLABLE) - id customRenderedInterstitialDelegate; +@property(nonatomic, weak, nullable) id + customRenderedInterstitialDelegate; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/DFPRequest.h b/ios/platform/GoogleMobileAds.framework/Headers/DFPRequest.h index 08f070f1..20d4d129 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/DFPRequest.h +++ b/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 - #import #import -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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdChoicesView.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdChoicesView.h index c9bab806..82e820e5 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdChoicesView.h +++ b/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 - -#import #import - -GAD_ASSUME_NONNULL_BEGIN +#import /// 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 diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdFormat.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdFormat.h new file mode 100644 index 00000000..07933c94 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdFormat.h @@ -0,0 +1,14 @@ +// +// GADAdFormat.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +/// Requested ad format. +typedef NS_ENUM(NSInteger, GADAdFormat) { + GADAdFormatBanner, ///< Banner. + GADAdFormatInterstitial, ///< Interstitial. + GADAdFormatRewarded, ///< Rewarded. + GADAdFormatNative, ///< Native. +}; diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoader.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoader.h index f5721616..1520a8a7 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoader.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoader.h @@ -2,19 +2,16 @@ // GADAdLoader.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import -#import - #import #import #import #import #import - -GAD_ASSUME_NONNULL_BEGIN +#import /// Ad loader options base class. See each ad type's header for available GADAdLoaderOptions /// subclasses. @@ -26,10 +23,10 @@ GAD_ASSUME_NONNULL_BEGIN /// Object notified when an ad request succeeds or fails. Must conform to requested ad types' /// delegate protocols. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; /// The ad loader's ad unit ID. -@property(nonatomic, readonly) NSString *adUnitID; +@property(nonatomic, readonly, nonnull) NSString *adUnitID; /// Indicates whether the ad loader is loading. @property(nonatomic, getter=isLoading, readonly) BOOL loading; @@ -38,16 +35,14 @@ GAD_ASSUME_NONNULL_BEGIN /// /// @param rootViewController The root view controller is used to present ad click actions. /// @param adTypes An array of ad types. See GADAdLoaderAdTypes.h for available ad types. -/// @param options An array of GADAdLoaderOptions objects to configure how ads are loaded, or nil to -/// use default options. See each ad type's header for available GADAdLoaderOptions subclasses. -- (instancetype)initWithAdUnitID:(NSString *)adUnitID - rootViewController:(UIViewController *GAD_NULLABLE_TYPE)rootViewController - adTypes:(NSArray *)adTypes - options:(NSArray *GAD_NULLABLE_TYPE)options; +/// @param options An array of GADAdLoaderOptions objects to configure how ads are loaded, or nil +/// to use default options. See each ad type's header for available GADAdLoaderOptions subclasses. +- (nonnull instancetype)initWithAdUnitID:(nonnull NSString *)adUnitID + rootViewController:(nullable UIViewController *)rootViewController + adTypes:(nonnull NSArray *)adTypes + options:(nullable NSArray *)options; /// Loads the ad and informs the delegate of the outcome. -- (void)loadRequest:(GADRequest *GAD_NULLABLE_TYPE)request; +- (void)loadRequest:(nullable GADRequest *)request; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h index a99a5d49..e280e569 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h @@ -2,40 +2,35 @@ // GADAdLoaderAdTypes.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import -GAD_ASSUME_NONNULL_BEGIN - -typedef NSString *GADAdLoaderAdType GAD_STRING_ENUM; +typedef NSString *GADAdLoaderAdType NS_STRING_ENUM; /// Use with GADAdLoader to request native app install ads. To receive ads, the ad loader's delegate /// must conform to the GADNativeAppInstallAdLoaderDelegate protocol. See GADNativeAppInstallAd.h. /// /// See GADNativeAdImageAdLoaderOptions.h for ad loader image options. -GAD_EXTERN GADAdLoaderAdType const kGADAdLoaderAdTypeNativeAppInstall; +GAD_EXTERN GADAdLoaderAdType _Nonnull const kGADAdLoaderAdTypeNativeAppInstall; /// Use with GADAdLoader to request native content ads. To receive ads, the ad loader's delegate /// must conform to the GADNativeContentAdLoaderDelegate protocol. See GADNativeContentAd.h. /// /// See GADNativeAdImageAdLoaderOptions.h for ad loader image options. -GAD_EXTERN GADAdLoaderAdType const kGADAdLoaderAdTypeNativeContent; +GAD_EXTERN GADAdLoaderAdType _Nonnull const kGADAdLoaderAdTypeNativeContent; /// Use with GADAdLoader to request native custom template ads. To receive ads, the ad loader's /// delegate must conform to the GADNativeCustomTemplateAdLoaderDelegate protocol. See /// GADNativeCustomTemplateAd.h. -GAD_EXTERN GADAdLoaderAdType const kGADAdLoaderAdTypeNativeCustomTemplate; +GAD_EXTERN GADAdLoaderAdType _Nonnull const kGADAdLoaderAdTypeNativeCustomTemplate; -/// Use with GADAdLoader to request DFP banner ads. To receive ads, the ad loader's delegate must -/// conform to the DFPBannerAdLoaderDelegate protocol. See DFPBannerView.h. -GAD_EXTERN GADAdLoaderAdType const kGADAdLoaderAdTypeDFPBanner; +/// Use with GADAdLoader to request Google Ad Manager banner ads. To receive ads, the ad loader's +/// delegate must conform to the DFPBannerAdLoaderDelegate protocol. See DFPBannerView.h. +GAD_EXTERN GADAdLoaderAdType _Nonnull const kGADAdLoaderAdTypeDFPBanner; /// Use with GADAdLoader to request native ads. To receive ads, the ad loader's delegate must /// conform to the GADUnifiedNativeAdLoaderDelegate protocol. See GADUnifiedNativeAd.h. -GAD_EXTERN GADAdLoaderAdType const kGADAdLoaderAdTypeUnifiedNative; - -GAD_ASSUME_NONNULL_END +GAD_EXTERN GADAdLoaderAdType _Nonnull const kGADAdLoaderAdTypeUnifiedNative; diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderDelegate.h index a72a95f6..ab98330a 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdLoaderDelegate.h @@ -2,30 +2,26 @@ // GADAdLoaderDelegate.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import #import @class GADAdLoader; -GAD_ASSUME_NONNULL_BEGIN - /// Base ad loader delegate protocol. Ad types provide extended protocols that declare methods to /// handle successful ad loads. -@protocol GADAdLoaderDelegate +@protocol GADAdLoaderDelegate /// Called when adLoader fails to load an ad. -- (void)adLoader:(GADAdLoader *)adLoader didFailToReceiveAdWithError:(GADRequestError *)error; +- (void)adLoader:(nonnull GADAdLoader *)adLoader + didFailToReceiveAdWithError:(nonnull GADRequestError *)error; @optional /// Called after adLoader has finished loading. -- (void)adLoaderDidFinishLoading:(GADAdLoader *)adLoader; +- (void)adLoaderDidFinishLoading:(nonnull GADAdLoader *)adLoader; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdMetadataKeys.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdMetadataKeys.h new file mode 100644 index 00000000..981a2219 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdMetadataKeys.h @@ -0,0 +1,12 @@ +// +// GADAdMetadataKeys.h +// Google Mobile Ads SDK +// +// Copyright 2017 Google LLC. All rights reserved. +// + +#import +#import +#import + +typedef NSString *GADAdMetadataKey NS_STRING_ENUM; diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdNetworkExtras.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdNetworkExtras.h index 55c62f13..c78380be 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdNetworkExtras.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdNetworkExtras.h @@ -2,21 +2,16 @@ // GADAdNetworkExtras.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import - #import -GAD_ASSUME_NONNULL_BEGIN - /// An object implementing this protocol contains information set by the publisher on the client /// device for a particular ad network. /// /// Ad networks should create an 'extras' object implementing this protocol for their publishers to /// use. -@protocol GADAdNetworkExtras +@protocol GADAdNetworkExtras @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdReward.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdReward.h index 38aeefb5..953592a9 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdReward.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdReward.h @@ -2,29 +2,24 @@ // GADAdReward.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import -GAD_ASSUME_NONNULL_BEGIN - /// Reward information for GADRewardBasedVideoAd ads. @interface GADAdReward : NSObject /// Type of the reward. -@property(nonatomic, readonly, copy) NSString *type; +@property(nonatomic, readonly, nonnull) NSString *type; /// Amount rewarded to the user. -@property(nonatomic, readonly, copy) NSDecimalNumber *amount; +@property(nonatomic, readonly, nonnull) NSDecimalNumber *amount; -/// Returns an initialized GADAdReward with the provided reward type and reward amount. rewardType -/// and rewardAmount must not be nil. -- (instancetype)initWithRewardType:(NSString *)rewardType - rewardAmount:(NSDecimalNumber *)rewardAmount NS_DESIGNATED_INITIALIZER; +/// Returns an initialized GADAdReward with the provided reward type and reward amount. +- (nonnull instancetype)initWithRewardType:(nonnull NSString *)rewardType + rewardAmount:(nonnull NSDecimalNumber *)rewardAmount + NS_DESIGNATED_INITIALIZER; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdSize.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdSize.h index c92b767d..c2f3cdca 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdSize.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdSize.h @@ -2,15 +2,12 @@ // GADAdSize.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import -#import - #import - -GAD_ASSUME_NONNULL_BEGIN +#import /// A valid GADAdSize is considered to be one of the predefined GADAdSize constants or a GADAdSize /// constructed by GADAdSizeFromCGSize, GADAdSizeFullWidthPortraitWithHeight, @@ -52,11 +49,11 @@ GAD_EXTERN GADAdSize const kGADAdSizeLeaderboard; GAD_EXTERN GADAdSize const kGADAdSizeSkyscraper; /// An ad size that spans the full width of the application in portrait orientation. The height is -/// typically 50 pixels on an iPhone/iPod UI, and 90 pixels tall on an iPad UI. +/// typically 50 points on an iPhone/iPod UI, and 90 points tall on an iPad UI. GAD_EXTERN GADAdSize const kGADAdSizeSmartBannerPortrait; /// An ad size that spans the full width of the application in landscape orientation. The height is -/// typically 32 pixels on an iPhone/iPod UI, and 90 pixels tall on an iPad UI. +/// typically 32 points on an iPhone/iPod UI, and 90 points tall on an iPad UI. GAD_EXTERN GADAdSize const kGADAdSizeSmartBannerLandscape; /// An ad size that spans the full width of its container, with a height dynamically determined by @@ -97,13 +94,13 @@ GAD_EXTERN BOOL IsGADAdSizeValid(GADAdSize size); GAD_EXTERN BOOL GADAdSizeIsFluid(GADAdSize size); /// Returns a NSString describing the provided GADAdSize. -GAD_EXTERN NSString *NSStringFromGADAdSize(GADAdSize size); +GAD_EXTERN NSString *_Nonnull NSStringFromGADAdSize(GADAdSize size); /// Returns an NSValue representing the GADAdSize. -GAD_EXTERN NSValue *NSValueFromGADAdSize(GADAdSize size); +GAD_EXTERN NSValue *_Nonnull NSValueFromGADAdSize(GADAdSize size); /// Returns a GADAdSize from an NSValue. Returns kGADAdSizeInvalid if the value is not a GADAdSize. -GAD_EXTERN GADAdSize GADAdSizeFromNSValue(NSValue *value); +GAD_EXTERN GADAdSize GADAdSizeFromNSValue(NSValue *_Nonnull value); #pragma mark Deprecated Macros @@ -113,5 +110,3 @@ GAD_EXTERN GADAdSize GADAdSizeFromNSValue(NSValue *value); #define GAD_SIZE_468x60 CGSizeFromGADAdSize(kGADAdSizeFullBanner) #define GAD_SIZE_728x90 CGSizeFromGADAdSize(kGADAdSizeLeaderboard) #define GAD_SIZE_120x600 CGSizeFromGADAdSize(kGADAdSizeSkyscraper) - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAdSizeDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAdSizeDelegate.h index ce82adce..c32e8616 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAdSizeDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAdSizeDelegate.h @@ -2,25 +2,20 @@ // GADAdSizeDelegate.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import - #import #import @class GADBannerView; -GAD_ASSUME_NONNULL_BEGIN - -/// The class implementing this protocol will be notified when the DFPBannerView changes ad size. -/// Any views that may be affected by the banner size change will have time to adjust. -@protocol GADAdSizeDelegate +/// The class implementing this protocol will be notified when the GADBannerView's ad content +/// changes size. Any views that may be affected by the banner size change will have time to adjust. +@protocol GADAdSizeDelegate /// Called before the ad view changes to the new size. -- (void)adView:(GADBannerView *)bannerView willChangeAdSizeTo:(GADAdSize)size; +- (void)adView:(nonnull GADBannerView *)bannerView willChangeAdSizeTo:(GADAdSize)size; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAppEventDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAppEventDelegate.h index a9f79cf1..e66c9cc2 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAppEventDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAppEventDelegate.h @@ -2,34 +2,29 @@ // GADAppEventDelegate.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import - #import @class GADBannerView; @class GADInterstitial; -GAD_ASSUME_NONNULL_BEGIN - /// Implement your app event within these methods. The delegate will be notified when the SDK /// receives an app event message from the ad. -@protocol GADAppEventDelegate +@protocol GADAppEventDelegate @optional /// Called when the banner receives an app event. -- (void)adView:(GADBannerView *)banner - didReceiveAppEvent:(NSString *)name - withInfo:(NSString *GAD_NULLABLE_TYPE)info; +- (void)adView:(nonnull GADBannerView *)banner + didReceiveAppEvent:(nonnull NSString *)name + withInfo:(nullable NSString *)info; /// Called when the interstitial receives an app event. -- (void)interstitial:(GADInterstitial *)interstitial - didReceiveAppEvent:(NSString *)name - withInfo:(NSString *GAD_NULLABLE_TYPE)info; +- (void)interstitial:(nonnull GADInterstitial *)interstitial + didReceiveAppEvent:(nonnull NSString *)name + withInfo:(nullable NSString *)info; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAppOpenAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAppOpenAd.h new file mode 100644 index 00000000..62c60229 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAppOpenAd.h @@ -0,0 +1,56 @@ +// +// GADAppOpenAd.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import +#import +#import + +#pragma mark - App Open Ad + +@class GADAppOpenAd; + +/// The handler block to execute when the ad load operation completes. If the load failed, the +/// appOpenAd is nil and the |error| is non-nil. On success, the appOpenAd is non-nil and the +/// |error| is nil. +typedef void (^GADAppOpenAdLoadCompletionHandler)(GADAppOpenAd *_Nullable appOpenAd, + NSError *_Nullable error); + +/// Ad shown at app open time. +@interface GADAppOpenAd : NSObject + +/// Loads an app open ad. +/// +/// @param adUnitID An ad unit ID created in the AdMob or Ad Manager UI. +/// @param request An ad request object. If nil, a default ad request object is used. +/// @param orientation The interface orientation that the ad will be presented in. +/// @param completionHandler A handler to execute when the load operation finishes or times out. ++ (void)loadWithAdUnitID:(nonnull NSString *)adUnitID + request:(nullable GADRequest *)request + orientation:(UIInterfaceOrientation)orientation + completionHandler:(nonnull GADAppOpenAdLoadCompletionHandler)completionHandler; + +/// Information about the ad response that returned the ad. +@property(nonatomic, readonly, nonnull) GADResponseInfo *responseInfo; + +@end + +#pragma mark - App Open Ad View + +/// The handler block to execute when the ad is about to be closed. +typedef void (^GADAppOpenAdCloseHandler)(void); + +/// Displays app open ads. +@interface GADAppOpenAdView : UIView + +/// The ad displayed in the ad view. +@property(nonatomic, nullable) GADAppOpenAd *appOpenAd; + +/// The handler to execute when the ad is about to be closed. The ad is closed when the user clicks +/// the ad's close button or when the ad has been shown for a few seconds. +@property(nonatomic, nullable) GADAppOpenAdCloseHandler adCloseHandler; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManager.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManager.h index c89d64ec..a927b57a 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManager.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManager.h @@ -2,19 +2,16 @@ // GADAudioVideoManager.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import #import -GAD_ASSUME_NONNULL_BEGIN - -/// Provides audio and video notifications and configurations management. Available only on iOS 7 -/// and above. +/// Provides audio and video notifications and configurations management. /// /// Don't create an instance of this class and use the one available from GADMobileAds -/// sharedInstace's audioVideoManager. +/// sharedInstance's audioVideoManager. @interface GADAudioVideoManager : NSObject /// Delegate for receiving video and audio updates. @@ -26,9 +23,7 @@ GAD_ASSUME_NONNULL_BEGIN /// AVAudioSession's category to AVAudioSessionCategoryAmbient when all videos are muted, setting /// AVAudioSession's category to AVAudioSessionCategorySoloAmbient when any playing video becomes /// unmuted, and allowing background apps to continue playing sound when all videos rendered by -/// Google Mobile Ads SDK are muted or have stopped playing. +/// Google Mobile Ads SDK are muted or have stopped playing. Must be accessed on main thread only. @property(nonatomic, assign) BOOL audioSessionIsApplicationManaged; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManagerDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManagerDelegate.h index 897431a9..567b3944 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManagerDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADAudioVideoManagerDelegate.h @@ -2,29 +2,28 @@ // GADAudioVideoManagerDelegate.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import @class GADAudioVideoManager; -GAD_ASSUME_NONNULL_BEGIN - -@protocol GADAudioVideoManagerDelegate +/// A set of methods to inform the delegate of audio video manager events. +@protocol GADAudioVideoManagerDelegate @optional /// Tells the delegate that the Google Mobile Ads SDK will start playing a video. This method isn't /// called if another video rendered by Google Mobile Ads SDK is already playing. -- (void)audioVideoManagerWillPlayVideo:(GADAudioVideoManager *)audioVideoManager; +- (void)audioVideoManagerWillPlayVideo:(nonnull GADAudioVideoManager *)audioVideoManager; /// Tells the delegate that the Google Mobile Ads SDK has paused/stopped all video playback. -- (void)audioVideoManagerDidPauseAllVideo:(GADAudioVideoManager *)audioVideoManager; +- (void)audioVideoManagerDidPauseAllVideo:(nonnull GADAudioVideoManager *)audioVideoManager; /// Tells the delegate that at least one video rendered by the Google Mobile Ads SDK will play /// sound. Your app should stop playing sound when this method is called. -- (void)audioVideoManagerWillPlayAudio:(GADAudioVideoManager *)audioVideoManager; +- (void)audioVideoManagerWillPlayAudio:(nonnull GADAudioVideoManager *)audioVideoManager; /// Tells the delegate that all the video rendered by the Google Mobile Ads SDK has stopped playing /// sound. Your app can now resume any music playback or produce any kind of sound. Note that this @@ -32,8 +31,6 @@ GAD_ASSUME_NONNULL_BEGIN /// deactivate AVAudioSession's instance. Doing so can lead to unexpected video playback behavior. /// You may deactivate AVAudioSession only when all rendered video ads are paused or have finished /// playing, and 'audioVideoDidPauseAllVideo:' is called. -- (void)audioVideoManagerDidStopPlayingAudio:(GADAudioVideoManager *)audioVideoManager; +- (void)audioVideoManagerDidStopPlayingAudio:(nonnull GADAudioVideoManager *)audioVideoManager; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADBannerView.h b/ios/platform/GoogleMobileAds.framework/Headers/GADBannerView.h index 7a8dc292..6094d6c5 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADBannerView.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADBannerView.h @@ -2,20 +2,18 @@ // GADBannerView.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // -#import - #import #import #import #import #import #import +#import #import - -GAD_ASSUME_NONNULL_BEGIN +#import /// The view that displays banner ads. A minimum implementation to get an ad from within a /// UIViewController class is: @@ -36,11 +34,11 @@ GAD_ASSUME_NONNULL_BEGIN /// Initializes and returns a banner view with the specified ad size and origin relative to the /// banner's superview. -- (instancetype)initWithAdSize:(GADAdSize)adSize origin:(CGPoint)origin; +- (nonnull instancetype)initWithAdSize:(GADAdSize)adSize origin:(CGPoint)origin; /// Initializes and returns a banner view with the specified ad size placed at its superview's /// origin. -- (instancetype)initWithAdSize:(GADAdSize)adSize; +- (nonnull instancetype)initWithAdSize:(GADAdSize)adSize; #pragma mark Pre-Request @@ -49,14 +47,15 @@ GAD_ASSUME_NONNULL_BEGIN /// important for targeting and statistics. /// /// Example AdMob ad unit ID: @"ca-app-pub-0123456789012345/0123456789" -@property(nonatomic, copy, GAD_NULLABLE) IBInspectable NSString *adUnitID; +@property(nonatomic, copy, nullable) IBInspectable NSString *adUnitID; -/// Required reference to the current root view controller. For example the root view controller in -/// tab-based application would be the UITabViewController. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIViewController *rootViewController; +/// Required reference to a root view controller that is used by the banner to present full screen +/// content after the user interacts with the ad. The root view controller is most commonly the view +/// controller displaying the banner. +@property(nonatomic, weak, nullable) IBOutlet UIViewController *rootViewController; -/// Required to set this banner view to a proper size. Never create your own GADAdSize directly. Use -/// one of the predefined standard ad sizes (such as kGADAdSizeBanner), or create one using the +/// Required to set this banner view to a proper size. Never create your own GADAdSize directly. +/// Use one of the predefined standard ad sizes (such as kGADAdSizeBanner), or create one using the /// GADAdSizeFromCGSize method. If not using mediation, then changing the adSize after an ad has /// been shown will cause a new request (for an ad of the new size) to be sent. If using mediation, /// then a new request may not be sent. @@ -64,44 +63,47 @@ GAD_ASSUME_NONNULL_BEGIN /// Optional delegate object that receives state change notifications from this GADBannerView. /// Typically this is a UIViewController. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id delegate; +@property(nonatomic, weak, nullable) IBOutlet id delegate; /// Optional delegate that is notified when creatives cause the banner to change size. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id adSizeDelegate; +@property(nonatomic, weak, nullable) IBOutlet id adSizeDelegate; #pragma mark Making an Ad Request -/// Makes an ad request. The request object supplies targeting information. -- (void)loadRequest:(GADRequest *GAD_NULLABLE_TYPE)request; +/// Requests an ad. The request object supplies targeting information. +- (void)loadRequest:(nullable GADRequest *)request; /// A Boolean value that determines whether autoloading of ads in the receiver is enabled. If /// enabled, you do not need to call the loadRequest: method to load ads. @property(nonatomic, assign, getter=isAutoloadEnabled) IBInspectable BOOL autoloadEnabled; -#pragma mark Mediation +#pragma mark Response -/// The ad network class name that fetched the current ad. Returns nil while the latest ad request -/// is in progress or if the latest ad request failed. For both standard and mediated Google AdMob -/// ads, this property returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation custom -/// events, this property returns @"GADMAdapterCustomEvents". -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *adNetworkClassName; +/// Information about the ad response that returned the current ad. Nil while an ad +/// request is in progress or if the latest ad request failed. +@property(nonatomic, readonly, nullable) GADResponseInfo *responseInfo; #pragma mark Deprecated -/// Indicates if the currently displayed ad (or most recent failure) was a result of auto refreshing -/// as specified on server. This property is set to NO after each loadRequest: method. +/// Indicates whether the currently displayed ad (or most recent failure) was a result of auto +/// refreshing as specified on server. This property is set to NO after each loadRequest: method. @property(nonatomic, readonly, assign) BOOL hasAutoRefreshed GAD_DEPRECATED_ATTRIBUTE; -/// Deprecated delegate. GADInAppPurchase has been deprecated. -@property(nonatomic, weak, GAD_NULLABLE) - IBOutlet id inAppPurchaseDelegate GAD_DEPRECATED_ATTRIBUTE; +/// Deprecated delegate. GADInAppPurchase is deprecated. +@property(nonatomic, weak, nullable) IBOutlet id inAppPurchaseDelegate + GAD_DEPRECATED_ATTRIBUTE; /// The mediated ad network's underlying ad view. You may use this property to read the ad's actual /// size and adjust this banner view's frame origin. However, modifying the banner view's frame size /// triggers the Mobile Ads SDK to request a new ad. Only update the banner view's frame origin. -@property(nonatomic, readonly, weak, GAD_NULLABLE) - UIView *mediatedAdView GAD_DEPRECATED_MSG_ATTRIBUTE("Use adNetworkClassName."); +@property(nonatomic, readonly, weak, nullable) + UIView *mediatedAdView GAD_DEPRECATED_MSG_ATTRIBUTE("Use responseInfo.adNetworkClassName."); -@end +/// The ad network class name that fetched the current ad. Returns nil while the latest ad request +/// is in progress or if the latest ad request failed. For both standard and mediated Google AdMob +/// ads, this property returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation custom +/// events, this property returns @"GADMAdapterCustomEvents". +@property(nonatomic, readonly, nullable) NSString *adNetworkClassName GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use responseInfo.adNetworkClassName."); -GAD_ASSUME_NONNULL_END +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADBannerViewDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADBannerViewDelegate.h index 991fc32e..94703b32 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADBannerViewDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADBannerViewDelegate.h @@ -2,21 +2,18 @@ // GADBannerViewDelegate.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // #import - #import #import @class GADBannerView; -GAD_ASSUME_NONNULL_BEGIN - /// Delegate methods for receiving GADBannerView state change messages such as ad request status /// and ad click lifecycle. -@protocol GADBannerViewDelegate +@protocol GADBannerViewDelegate @optional @@ -24,30 +21,29 @@ GAD_ASSUME_NONNULL_BEGIN /// Tells the delegate that an ad request successfully received an ad. The delegate may want to add /// the banner view to the view hierarchy if it hasn't been added yet. -- (void)adViewDidReceiveAd:(GADBannerView *)bannerView; +- (void)adViewDidReceiveAd:(nonnull GADBannerView *)bannerView; /// Tells the delegate that an ad request failed. The failure is normally due to network /// connectivity or ad availablility (i.e., no fill). -- (void)adView:(GADBannerView *)bannerView didFailToReceiveAdWithError:(GADRequestError *)error; +- (void)adView:(nonnull GADBannerView *)bannerView + didFailToReceiveAdWithError:(nonnull GADRequestError *)error; #pragma mark Click-Time Lifecycle Notifications /// Tells the delegate that a full screen view will be presented in response to the user clicking on /// an ad. The delegate may want to pause animations and time sensitive interactions. -- (void)adViewWillPresentScreen:(GADBannerView *)bannerView; +- (void)adViewWillPresentScreen:(nonnull GADBannerView *)bannerView; /// Tells the delegate that the full screen view will be dismissed. -- (void)adViewWillDismissScreen:(GADBannerView *)bannerView; +- (void)adViewWillDismissScreen:(nonnull GADBannerView *)bannerView; /// Tells the delegate that the full screen view has been dismissed. The delegate should restart /// anything paused while handling adViewWillPresentScreen:. -- (void)adViewDidDismissScreen:(GADBannerView *)bannerView; +- (void)adViewDidDismissScreen:(nonnull GADBannerView *)bannerView; /// Tells the delegate that the user click will open another app, backgrounding the current /// application. The standard UIApplicationDelegate methods, like applicationDidEnterBackground:, /// are called immediately before this method is called. -- (void)adViewWillLeaveApplication:(GADBannerView *)bannerView; +- (void)adViewWillLeaveApplication:(nonnull GADBannerView *)bannerView; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCorrelator.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCorrelator.h deleted file mode 100644 index 909f0f4c..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCorrelator.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// GADCorrelator.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google Inc. All rights reserved. -// - -#import - -#import - -GAD_ASSUME_NONNULL_BEGIN - -/// Represents a correlation between multiple ads. Set an instance of this object on multiple ads to -/// indicate they are being used in a common context. -@interface GADCorrelator : NSObject - -/// Resets the correlator to force a new set of correlated ads. -- (void)reset; - -@end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCorrelatorAdLoaderOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCorrelatorAdLoaderOptions.h deleted file mode 100644 index b10d6075..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCorrelatorAdLoaderOptions.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// GADCorrelatorAdLoaderOptions.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google Inc. All rights reserved. -// - -#import -#import -#import - -GAD_ASSUME_NONNULL_BEGIN - -/// Ad loader options for adding a correlator to a native ad request. -@interface GADCorrelatorAdLoaderOptions : GADAdLoaderOptions - -/// Correlator object for correlating ads loaded by an ad loader to other ad objects. -@property(nonatomic, strong, GAD_NULLABLE) GADCorrelator *correlator; - -@end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBanner.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBanner.h index 53317d90..fbf86dcd 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBanner.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBanner.h @@ -2,26 +2,25 @@ // GADCustomEventBanner.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // -#import - #import #import #import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// The banner custom event protocol. Your banner custom event handler must implement this protocol. -@protocol GADCustomEventBanner +@protocol GADCustomEventBanner /// Inform |delegate| with the custom event execution results to ensure mediation behaves correctly. /// /// In your class, define the -delegate and -setDelegate: methods or use "@synthesize delegate". The /// Google Mobile Ads SDK sets this property on instances of your class. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; /// Called by mediation when your custom event is scheduled to be executed. Report execution results /// to the delegate. @@ -31,10 +30,10 @@ GAD_ASSUME_NONNULL_BEGIN /// @param serverLabel Label configured in the mediation UI. /// @param request Contains ad request information. - (void)requestBannerAd:(GADAdSize)adSize - parameter:(NSString *GAD_NULLABLE_TYPE)serverParameter - label:(NSString *GAD_NULLABLE_TYPE)serverLabel + parameter:(nullable NSString *)serverParameter + label:(nullable NSString *)serverLabel request:(GADCustomEventRequest *)request; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBannerDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBannerDelegate.h index 8ec685c5..5a4f85a0 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBannerDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventBannerDelegate.h @@ -2,15 +2,14 @@ // GADCustomEventBannerDelegate.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import -#import - #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADCustomEventBanner; @@ -19,7 +18,7 @@ GAD_ASSUME_NONNULL_BEGIN /// Otherwise, if enough time passed (several seconds) after the SDK called the requestBannerAd: /// method of your custom event, the mediation SDK will consider the request timed out, and move on /// to the next ad network. -@protocol GADCustomEventBannerDelegate +@protocol GADCustomEventBannerDelegate /// Your Custom Event object must call this when it receives or creates an ad view. - (void)customEventBanner:(id)customEvent didReceiveAd:(UIView *)view; @@ -27,8 +26,7 @@ GAD_ASSUME_NONNULL_BEGIN /// Your Custom Event object must call this when it fails to receive or create the ad view. Pass /// along any error object sent from the ad network's SDK, or an NSError describing the error. Pass /// nil if not available. -- (void)customEventBanner:(id)customEvent - didFailAd:(NSError *GAD_NULLABLE_TYPE)error; +- (void)customEventBanner:(id)customEvent didFailAd:(nullable NSError *)error; /// Your Custom Event object should call this when the user touches or "clicks" the ad to initiate /// an action. When the SDK receives this callback, it reports the click back to the mediation @@ -65,4 +63,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventExtras.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventExtras.h index a42a35cc..fd14e205 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventExtras.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventExtras.h @@ -2,27 +2,26 @@ // GADCustomEventExtras.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import - #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Create an instance of this class to set additional parameters for each custom event object. The /// additional parameters for a custom event are keyed by the custom event label. These extras are /// passed to your implementation of GADCustomEventBanner or GADCustomEventInterstitial. -@interface GADCustomEventExtras : NSObject +@interface GADCustomEventExtras : NSObject /// Set additional parameters for the custom event with label |label|. To remove additional /// parameters associated with |label|, pass in nil for |extras|. -- (void)setExtras:(NSDictionary *GAD_NULLABLE_TYPE)extras forLabel:(NSString *)label; +- (void)setExtras:(nullable NSDictionary *)extras forLabel:(NSString *)label; /// Retrieve the extras for |label|. -- (NSDictionary *GAD_NULLABLE_TYPE)extrasForLabel:(NSString *)label; +- (nullable NSDictionary *)extrasForLabel:(NSString *)label; /// Removes all the extras set on this instance. - (void)removeAllExtras; @@ -32,4 +31,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitial.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitial.h index 7a05e3bd..b3c52c38 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitial.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitial.h @@ -2,26 +2,25 @@ // GADCustomEventInterstitial.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // -#import - #import #import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// The interstitial custom event protocol. Your interstitial custom event handler must implement /// this protocol. -@protocol GADCustomEventInterstitial +@protocol GADCustomEventInterstitial /// Inform |delegate| with the custom event execution results to ensure mediation behaves correctly. /// /// In your class, define the -delegate and -setDelegate: methods or use "@synthesize delegate". The /// Google Mobile Ads SDK sets this property on instances of your class. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; /// Called by mediation when your custom event is scheduled to be executed. Your implementation /// should start retrieving the interstitial ad. Report execution results to the delegate. You must @@ -30,8 +29,8 @@ GAD_ASSUME_NONNULL_BEGIN /// @param serverParameter Parameter configured in the mediation UI. /// @param serverLabel Label configured in the mediation UI. /// @param request Contains ad request information. -- (void)requestInterstitialAdWithParameter:(NSString *GAD_NULLABLE_TYPE)serverParameter - label:(NSString *GAD_NULLABLE_TYPE)serverLabel +- (void)requestInterstitialAdWithParameter:(nullable NSString *)serverParameter + label:(nullable NSString *)serverLabel request:(GADCustomEventRequest *)request; /// Present the interstitial ad as a modal view using the provided view controller. Called only @@ -40,4 +39,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitialDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitialDelegate.h index 97219d3e..5ca66268 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitialDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventInterstitialDelegate.h @@ -2,14 +2,13 @@ // GADCustomEventInterstitialDelegate.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import - #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADCustomEventInterstitial; @@ -19,7 +18,7 @@ GAD_ASSUME_NONNULL_BEGIN /// (several seconds) after the SDK called the requestInterstitialAdWithParameter: method of your /// custom event, the mediation SDK will consider the request timed out, and move on to the next ad /// network. -@protocol GADCustomEventInterstitialDelegate +@protocol GADCustomEventInterstitialDelegate /// Your Custom Event object must call this when it receives or creates an interstitial ad. - (void)customEventInterstitialDidReceiveAd:(id)customEvent; @@ -28,7 +27,7 @@ GAD_ASSUME_NONNULL_BEGIN /// any error object sent from the ad network's SDK, or an NSError describing the error. Pass nil if /// not available. - (void)customEventInterstitial:(id)customEvent - didFailAd:(NSError *GAD_NULLABLE_TYPE)error; + didFailAd:(nullable NSError *)error; /// Your Custom Event object should call this when the user touches or "clicks" the ad to initiate /// an action. When the SDK receives this callback, it reports the click back to the mediation @@ -59,4 +58,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAd.h index 9a99c7e4..314abda8 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAd.h @@ -2,21 +2,20 @@ // GADCustomEventNativeAd.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADCustomEventNativeAdDelegate; /// Native ad custom event protocol. Your native ad custom event handler class must conform to this /// protocol. -@protocol GADCustomEventNativeAd +@protocol GADCustomEventNativeAd /// Called when the custom event is scheduled to be executed. /// @@ -33,26 +32,26 @@ GAD_ASSUME_NONNULL_BEGIN options:(NSArray *)options rootViewController:(UIViewController *)rootViewController; -/// Indicates if the custom event handles user clicks. Return YES if the custom event should handle -/// user clicks. In this case, the Google Mobile Ads SDK doesn't track user clicks and the custom -/// event must notify the Google Mobile Ads SDK of clicks using +/// Indicates whether the custom event handles user clicks. Return YES if the custom event should +/// handle user clicks. In this case, the Google Mobile Ads SDK doesn't track user clicks and the +/// custom event must notify the Google Mobile Ads SDK of clicks using /// +[GADMediatedNativeAdNotificationSource mediatedNativeAdDidRecordClick:]. Return NO if the /// custom event doesn't handles user clicks. In this case, the Google Mobile Ads SDK tracks user /// clicks itself and the custom event is notified of user clicks via -[GADMediatedNativeAdDelegate /// mediatedNativeAd:didRecordClickOnAssetWithName:view:viewController:]. - (BOOL)handlesUserClicks; -/// Indicates if the custom event handles user impressions tracking. If this method returns YES, the -/// Google Mobile Ads SDK will not track user impressions and the custom event must notify the -/// Google Mobile Ads SDK of impressions using +[GADMediatedNativeAdNotificationSource -/// mediatedNativeAdDidRecordImpression:]. If this method returns NO, -/// the Google Mobile Ads SDK tracks user impressions and notifies the custom event of impressions -/// using -[GADMediatedNativeAdDelegate mediatedNativeAdDidRecordImpression:]. +/// Indicates whether the custom event handles user impressions tracking. If this method returns +/// YES, the Google Mobile Ads SDK will not track user impressions and the custom event must notify +/// the Google Mobile Ads SDK of impressions using +[GADMediatedNativeAdNotificationSource +/// mediatedNativeAdDidRecordImpression:]. If this method returns NO, the Google Mobile Ads SDK +/// tracks user impressions and notifies the custom event of impressions using +/// -[GADMediatedNativeAdDelegate mediatedNativeAdDidRecordImpression:]. - (BOOL)handlesUserImpressions; /// Delegate object used for receiving custom native ad load request progress. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAdDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAdDelegate.h index 4a946025..4ded3e8e 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAdDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventNativeAdDelegate.h @@ -2,22 +2,21 @@ // GADCustomEventNativeAdDelegate.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import #import #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// The delegate of the GADCustomEventNativeAd object must adopt the GADCustomEventNativeAdDelegate /// protocol. Methods in this protocol are used for native ad's custom event communication with the /// Google Mobile Ads SDK. -@protocol GADCustomEventNativeAdDelegate +@protocol GADCustomEventNativeAdDelegate /// Tells the delegate that the custom event ad request succeeded and loaded a native ad. - (void)customEventNativeAd:(id)customEventNativeAd @@ -28,9 +27,10 @@ GAD_ASSUME_NONNULL_BEGIN didFailToLoadWithError:(NSError *)error; /// Tells the delegate that the custom event ad request succeeded and loaded a unified native ad. -- (void)customEventNativeAd:(id)customEventNativeAd - didReceiveMediatedUnifiedNativeAd:(id)mediatedUnifiedNativeAd; +- (void)customEventNativeAd:(nonnull id)customEventNativeAd + didReceiveMediatedUnifiedNativeAd: + (nonnull id)mediatedUnifiedNativeAd; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventParameters.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventParameters.h index 5a6041e7..73916692 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventParameters.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventParameters.h @@ -2,18 +2,17 @@ // GADCustomEventParameters.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import - #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Key for getting the server parameter configured in AdMob when mediating to a custom event /// adapter. /// Example: NSString *serverParameter = connector.credentials[GADCustomEventParametersServer]. GAD_EXTERN NSString *const GADCustomEventParametersServer; -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h index e702a3d4..83132bd4 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h @@ -2,17 +2,16 @@ // GADCustomEventRequest.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // -#import - #import #import +#import @class GADCustomEventExtras; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Specifies optional ad request targeting parameters that are provided by the publisher and are /// forwarded to custom events for purposes of populating an ad request to a 3rd party ad network. @@ -33,19 +32,19 @@ GAD_ASSUME_NONNULL_BEGIN /// Description of the user's location, in free form text, set in GADRequest. If not available, /// returns nil. This may be set even if userHasLocation is NO. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *userLocationDescription; +@property(nonatomic, readonly, copy, nullable) NSString *userLocationDescription; /// Keywords set in GADRequest. Returns nil if no keywords are set. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSArray *userKeywords; +@property(nonatomic, readonly, copy, nullable) NSArray *userKeywords; /// The additional parameters set by the application. This property allows you to pass additional /// information from your application to your Custom Event object. To do so, create an instance of /// GADCustomEventExtras to pass to GADRequest -registerAdNetworkExtras:. The instance should have /// an NSDictionary set for a particular custom event label. That NSDictionary becomes the /// additionalParameters here. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSDictionary *additionalParameters; +@property(nonatomic, readonly, copy, nullable) NSDictionary *additionalParameters; -/// Indicates if the testing property has been set in GADRequest. +/// Indicates whether the testing property has been set in GADRequest. @property(nonatomic, readonly, assign) BOOL isTesting; #pragma mark Deprecated methods @@ -54,8 +53,8 @@ GAD_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly, assign) GADGender userGender GAD_DEPRECATED_ATTRIBUTE; /// Deprecated. User's birthday set in GADRequest. If not specified, returns nil. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSDate *userBirthday GAD_DEPRECATED_ATTRIBUTE; +@property(nonatomic, readonly, copy, nullable) NSDate *userBirthday GAD_DEPRECATED_ATTRIBUTE; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADDebugOptionsViewController.h b/ios/platform/GoogleMobileAds.framework/Headers/GADDebugOptionsViewController.h index acc98dc3..909683e4 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADDebugOptionsViewController.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADDebugOptionsViewController.h @@ -2,35 +2,36 @@ // GADDebugOptionsViewController.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import -#import - #import +#import @class GADDebugOptionsViewController; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Delegate for the GADDebugOptionsViewController. -@protocol GADDebugOptionsViewControllerDelegate +@protocol GADDebugOptionsViewControllerDelegate + /// Called when the debug options flow is finished. - (void)debugOptionsViewControllerDidDismiss:(GADDebugOptionsViewController *)controller; + @end /// Displays debug options to the user. @interface GADDebugOptionsViewController : UIViewController /// Creates and returns a GADDebugOptionsViewController object initialized with the ad unit ID. -/// @param adUnitID An ad unit ID for the DFP account that is being configured with debug options. +/// @param adUnitID An ad unit ID for the Google Ad Manager account that is being configured with +/// debug options. + (instancetype)debugOptionsViewControllerWithAdUnitID:(NSString *)adUnitID; /// Delegate for the debug options view controller. -@property(nonatomic, weak, GAD_NULLABLE) - IBOutlet id delegate; +@property(nonatomic, weak, nullable) IBOutlet id delegate; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADDelayedAdRenderingOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADDelayedAdRenderingOptions.h new file mode 100644 index 00000000..308cd87c --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADDelayedAdRenderingOptions.h @@ -0,0 +1,22 @@ +#import + +#import + +/// Delegate for delayed rendering of Google banner ads. +@protocol GADDelayedAdRenderingDelegate + +/// Asks the delegate whether the ad loader should delay rendering the banner ad that it's chosen. +/// If the delegate returns YES, it must also call resumeHandler when it is ready for rendering to +/// resume. +- (BOOL)adLoader:(nonnull GADAdLoader *)adLoader + shouldDelayRenderingWithResumeHandler:(nonnull dispatch_block_t)resumeHandler; + +@end + +/// Ad loader options for configuring delayed rendering of Google banner ads. +@interface GADDelayedAdRenderingOptions : GADAdLoaderOptions + +/// Delegate for delaying the rendering of Google banner ads. +@property(nonatomic, nullable, weak) id delegate; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADDisplayAdMeasurement.h b/ios/platform/GoogleMobileAds.framework/Headers/GADDisplayAdMeasurement.h new file mode 100644 index 00000000..3816a85e --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADDisplayAdMeasurement.h @@ -0,0 +1,22 @@ +// +// GADDisplayAdMeasurement.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// +#import +#import + +/// Measurement used for display custom native ad formats. +@interface GADDisplayAdMeasurement : NSObject + +/// Ad view used to measure viewability. This property can be modified before or after starting +/// display ad measurement. Must be accessed on the main thread. +@property(nonatomic, weak, nullable) UIView *view; + +/// Starts OMID viewability measurement for display ads. Returns whether OMID viewability was +/// started and sets |error| if unable to start. Once started, all subsequent calls return YES and +/// have no effect. Must be called on the main thread. +- (BOOL)startWithError:(NSError *_Nullable *_Nullable)error; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADDynamicHeightSearchRequest.h b/ios/platform/GoogleMobileAds.framework/Headers/GADDynamicHeightSearchRequest.h index 4fefe66f..82adacc6 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADDynamicHeightSearchRequest.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADDynamicHeightSearchRequest.h @@ -2,13 +2,13 @@ // GADDynamicHeightSearchRequest.h // GoogleMobileAds // -// Copyright © 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Use to configure Custom Search Ad (CSA) ad requests. A dynamic height search banner can contain /// multiple ads and the height is set dynamically based on the ad contents. Please cross-reference @@ -21,45 +21,45 @@ GAD_ASSUME_NONNULL_BEGIN #pragma mark Required /// The CSA "query" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *query; +@property(nonatomic, copy, nullable) NSString *query; /// The CSA "adPage" parameter. @property(nonatomic, assign) NSInteger adPage; #pragma mark Configuration Settings -/// Indicates if the CSA "adTest" parameter is enabled. +/// Indicates whether the CSA "adTest" parameter is enabled. @property(nonatomic, assign) BOOL adTestEnabled; /// The CSA "channel" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *channel; +@property(nonatomic, copy, nullable) NSString *channel; /// The CSA "hl" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *hostLanguage; +@property(nonatomic, copy, nullable) NSString *hostLanguage; #pragma mark Layout and Styling /// The CSA "colorLocation" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *locationExtensionTextColor; +@property(nonatomic, copy, nullable) NSString *locationExtensionTextColor; /// The CSA "fontSizeLocation" parameter. @property(nonatomic, assign) CGFloat locationExtensionFontSize; #pragma mark Ad Extensions -/// Indicates if the CSA "clickToCall" parameter is enabled. +/// Indicates whether the CSA "clickToCall" parameter is enabled. @property(nonatomic, assign) BOOL clickToCallExtensionEnabled; -/// Indicates if the CSA "location" parameter is enabled. +/// Indicates whether the CSA "location" parameter is enabled. @property(nonatomic, assign) BOOL locationExtensionEnabled; -/// Indicates if the CSA "plusOnes" parameter is enabled. +/// Indicates whether the CSA "plusOnes" parameter is enabled. @property(nonatomic, assign) BOOL plusOnesExtensionEnabled; -/// Indicates if the CSA "sellerRatings" parameter is enabled. +/// Indicates whether the CSA "sellerRatings" parameter is enabled. @property(nonatomic, assign) BOOL sellerRatingsExtensionEnabled; -/// Indicates if the CSA "siteLinks" parameter is enabled. +/// Indicates whether the CSA "siteLinks" parameter is enabled. @property(nonatomic, assign) BOOL siteLinksExtensionEnabled; #pragma mark - Unit Level Parameters @@ -67,7 +67,7 @@ GAD_ASSUME_NONNULL_BEGIN #pragma mark Required /// The CSA "width" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *CSSWidth; +@property(nonatomic, copy, nullable) NSString *CSSWidth; /// Configuration Settings @@ -77,10 +77,10 @@ GAD_ASSUME_NONNULL_BEGIN #pragma mark Font /// The CSA "fontFamily" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *fontFamily; +@property(nonatomic, copy, nullable) NSString *fontFamily; /// The CSA "fontFamilyAttribution" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *attributionFontFamily; +@property(nonatomic, copy, nullable) NSString *attributionFontFamily; /// The CSA "fontSizeAnnotation" parameter. @property(nonatomic, assign) CGFloat annotationFontSize; @@ -100,36 +100,36 @@ GAD_ASSUME_NONNULL_BEGIN #pragma mark Color /// The CSA "colorAdBorder" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *adBorderColor; +@property(nonatomic, copy, nullable) NSString *adBorderColor; /// The CSA "colorAdSeparator" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *adSeparatorColor; +@property(nonatomic, copy, nullable) NSString *adSeparatorColor; /// The CSA "colorAnnotation" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *annotationTextColor; +@property(nonatomic, copy, nullable) NSString *annotationTextColor; /// The CSA "colorAttribution" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *attributionTextColor; +@property(nonatomic, copy, nullable) NSString *attributionTextColor; /// The CSA "colorBackground" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *backgroundColor; +@property(nonatomic, copy, nullable) NSString *backgroundColor; /// The CSA "colorBorder" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *borderColor; +@property(nonatomic, copy, nullable) NSString *borderColor; /// The CSA "colorDomainLink" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *domainLinkColor; +@property(nonatomic, copy, nullable) NSString *domainLinkColor; /// The CSA "colorText" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *textColor; +@property(nonatomic, copy, nullable) NSString *textColor; /// The CSA "colorTitleLink" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *titleLinkColor; +@property(nonatomic, copy, nullable) NSString *titleLinkColor; #pragma mark General Formatting /// The CSA "adBorderSelections" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *adBorderCSSSelections; +@property(nonatomic, copy, nullable) NSString *adBorderCSSSelections; /// The CSA "adjustableLineHeight" parameter. @property(nonatomic, assign) CGFloat adjustableLineHeight; @@ -138,12 +138,12 @@ GAD_ASSUME_NONNULL_BEGIN @property(nonatomic, assign) CGFloat attributionBottomSpacing; /// The CSA "borderSelections" parameter. -@property(nonatomic, copy, GAD_NULLABLE) NSString *borderCSSSelections; +@property(nonatomic, copy, nullable) NSString *borderCSSSelections; -/// Indicates if the CSA "noTitleUnderline" parameter is enabled. +/// Indicates whether the CSA "noTitleUnderline" parameter is enabled. @property(nonatomic, assign) BOOL titleUnderlineHidden; -/// Indicates if the CSA "titleBold" parameter is enabled. +/// Indicates whether the CSA "titleBold" parameter is enabled. @property(nonatomic, assign) BOOL boldTitleEnabled; /// The CSA "verticalSpacing" parameter. @@ -151,10 +151,10 @@ GAD_ASSUME_NONNULL_BEGIN #pragma mark Ad Extensions -/// Indicates if the CSA "detailedAttribution" parameter is enabled. +/// Indicates whether the CSA "detailedAttribution" parameter is enabled. @property(nonatomic, assign) BOOL detailedAttributionExtensionEnabled; -/// Indicates if the CSA "longerHeadlines" parameter is enabled. +/// Indicates whether the CSA "longerHeadlines" parameter is enabled. @property(nonatomic, assign) BOOL longerHeadlinesExtensionEnabled; /// Sets an advanced option value for a specified key. The value must be an NSString or NSNumber. @@ -162,4 +162,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADExtras.h b/ios/platform/GoogleMobileAds.framework/Headers/GADExtras.h index 3ca160fa..2ed25cb4 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADExtras.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADExtras.h @@ -2,22 +2,21 @@ // GADExtras.h // Google Mobile Ads SDK // -// Copyright 2012 Google Inc. All rights reserved. +// Copyright 2012 Google LLC. All rights reserved. // #import - #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Ad network extras sent to Google networks. -@interface GADExtras : NSObject +@interface GADExtras : NSObject /// Additional parameters to be sent to Google networks. -@property(nonatomic, copy, GAD_NULLABLE) NSDictionary *additionalParameters; +@property(nonatomic, copy, nullable) NSDictionary *additionalParameters; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchase.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchase.h index 979c3072..5cb09b2f 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchase.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchase.h @@ -2,15 +2,14 @@ // GADInAppPurchase.h // Google Mobile Ads SDK // -// Copyright 2013 Google Inc. All rights reserved. +// Copyright 2013 Google LLC. All rights reserved. // #import -#import - #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADDefaultInAppPurchaseDelegate; @@ -21,7 +20,6 @@ GAD_ASSUME_NONNULL_BEGIN /// Instances of this class are created and passed to your in-app purchase delegate after the user /// has successfully paid for a product. Your code must correctly deliver the product to the user /// and then call the didCompletePurchase method to finish the transaction. - GAD_DEPRECATED_ATTRIBUTE @interface GADDefaultInAppPurchase : NSObject @@ -60,10 +58,10 @@ GAD_DEPRECATED_ATTRIBUTE /// Enum of the different statuses resulting from processing a purchase. GAD_DEPRECATED_ATTRIBUTE typedef NS_ENUM(NSInteger, GADInAppPurchaseStatus) { - kGADInAppPurchaseStatusError = 0, ///< Error occured while processing the purchase. + kGADInAppPurchaseStatusError = 0, ///< Error occurred while processing the purchase. kGADInAppPurchaseStatusSuccessful = 1, ///< Purchase was completed successfully. kGADInAppPurchaseStatusCancel = 2, ///< Purchase was cancelled by the user. - kGADInAppPurchaseStatusInvalidProduct = 3 ///< Error occured while looking up the product. + kGADInAppPurchaseStatusInvalidProduct = 3 ///< Error occurred while looking up the product. }; /// The in-app purchase item to be purchased with the purchase flow handled by you, the @@ -80,11 +78,11 @@ GAD_DEPRECATED_ATTRIBUTE /// The product quantity. @property(nonatomic, readonly, assign) NSInteger quantity; -/// The GADInAppPurchaseDelegate object must call this method after handling the in-app purchase for -/// both successful and unsuccessful purchase attempts. This method reports ad conversion and +/// The GADInAppPurchaseDelegate object must call this method after handling the in-app purchase +/// for both successful and unsuccessful purchase attempts. This method reports ad conversion and /// purchase status information to Google. - (void)reportPurchaseStatus:(GADInAppPurchaseStatus)purchaseStatus; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchaseDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchaseDelegate.h index b7e09a76..77c595fe 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchaseDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInAppPurchaseDelegate.h @@ -2,24 +2,23 @@ // GADInAppPurchaseDelegate.h // Google Mobile Ads SDK // -// Copyright 2013 Google Inc. All rights reserved. +// Copyright 2013 Google LLC. All rights reserved. // #import - #import @class GADDefaultInAppPurchase; @class GADInAppPurchase; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN #pragma mark - Default Purchase Flow /// In-app purchase delegate protocol for default purchase handling. The delegate must deliver /// the purchased item then call the GADDefaultInAppPurchase object's finishTransaction method. GAD_DEPRECATED_ATTRIBUTE -@protocol GADDefaultInAppPurchaseDelegate +@protocol GADDefaultInAppPurchaseDelegate /// Called when the user successfully paid for a purchase. You must first deliver the purchased /// item to the user, then call defaultInAppPurchase's finishTransaction method. @@ -39,7 +38,7 @@ GAD_DEPRECATED_ATTRIBUTE /// In-app purchase delegate protocol for custom purchase handling. The delegate must handle the /// product purchase flow then call the GADInAppPurchase object's reportPurchaseStatus: method. GAD_DEPRECATED_ATTRIBUTE -@protocol GADInAppPurchaseDelegate +@protocol GADInAppPurchaseDelegate /// Called when the user clicks on the buy button of an in-app purchase ad. After the receiver /// handles the purchase, it must call the GADInAppPurchase object's reportPurchaseStatus: method. @@ -47,4 +46,4 @@ GAD_DEPRECATED_ATTRIBUTE @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInitializationStatus.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInitializationStatus.h new file mode 100644 index 00000000..a2084433 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInitializationStatus.h @@ -0,0 +1,39 @@ +// +// GADInitializationStatus.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +typedef NS_ENUM(NSInteger, GADAdapterInitializationState) { + /// The mediation adapter is less likely to fill ad requests. + GADAdapterInitializationStateNotReady = 0, + /// The mediation adapter is ready to service ad requests. + GADAdapterInitializationStateReady = 1 +}; + +/// An immutable snapshot of a mediation adapter's initialization status. +@interface GADAdapterStatus : NSObject + +/// Initialization state of the adapter. +@property(nonatomic, readonly) GADAdapterInitializationState state; + +/// Detailed description of the status. +@property(nonatomic, readonly, nonnull) NSString *description; + +/// The adapter's initialization latency in seconds. 0 if initialization has not yet ended. +@property(nonatomic, readonly) NSTimeInterval latency; + +@end + +/// An immutable snapshot of the Google Mobile Ads SDK's initialization status, categorized by +/// mediation adapter. +@interface GADInitializationStatus : NSObject +/// Initialization status of each ad network available to the Google Mobile Ads SDK, keyed by its +/// GADMAdapter's class name. The list of available ad networks may be incomplete during early +/// phases of SDK initialization. +@property(nonatomic, readonly, nonnull) + NSDictionary *adapterStatusesByClassName; +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInstreamAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInstreamAd.h new file mode 100644 index 00000000..e2cef9db --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInstreamAd.h @@ -0,0 +1,53 @@ +// +// GADInstreamAd.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import +#import +#import +#import +#import + +@class GADInstreamAd; + +/// Instream ad load completion handler. On load success, |instreamAd| is the non-nil instream ad +/// and |error| is nil. On load failure, |instreamAd| is nil and |error| provides failure +/// information. +typedef void (^GADInstreamAdLoadCompletionHandler)(GADInstreamAd *_Nullable instreamAd, + NSError *_Nullable error); + +/// An instream ad. +@interface GADInstreamAd : NSObject + +/// Loads an instream ad with the provided ad unit ID. Instream ads only support +/// GADMediaAspectRatioLandscape and GADMediaAspectRatioPortrait media aspect ratios, defaulting to +/// GADMediaAspectRatioLandscape. Calls the provided completion handler when the ad load completes. ++ (void)loadAdWithAdUnitID:(nonnull NSString *)adUnitID + request:(nullable GADRequest *)request + mediaAspectRatio:(GADMediaAspectRatio)mediaAspectRatio + completionHandler:(nonnull GADInstreamAdLoadCompletionHandler)completionHandler; + +/// Loads an instream ad with the provided ad tag. Calls the provided completion handler when the +/// ad load completes. ++ (void)loadAdWithAdTag:(nonnull NSString *)adTag + completionHandler:(nonnull GADInstreamAdLoadCompletionHandler)completionHandler; + +/// Video controller for controlling to the video rendered by the instream ad. +@property(nonatomic, readonly, nullable) GADVideoController *videoController; + +/// Information about the ad response that returned the ad. +@property(nonatomic, readonly, nonnull) GADResponseInfo *responseInfo; + +/// Video duration. +@property(nonatomic, readonly) NSTimeInterval duration; + +/// Video's current time. +@property(nonatomic, readonly) NSTimeInterval currentTime; + +/// Video aspect ratio (width/height). +@property(nonatomic, readonly) CGFloat aspectRatio; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInstreamAdView.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInstreamAdView.h new file mode 100644 index 00000000..b230044f --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInstreamAdView.h @@ -0,0 +1,16 @@ +// +// GADInstreamAdView.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import + +/// A view that displays instream video ads. +@interface GADInstreamAdView : UIView + +/// The instream ad. The ad will begin playing when the GADInstreamAdView is visible. +@property(nonatomic, nullable) GADInstreamAd *ad; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitial.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitial.h index c0d0e02a..fcf0ff05 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitial.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitial.h @@ -2,18 +2,16 @@ // GADInterstitial.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // -#import - #import #import #import #import +#import #import - -GAD_ASSUME_NONNULL_BEGIN +#import /// An interstitial ad. This is a full-screen advertisement shown at natural transition points in /// your application such as between game levels or news stories. @@ -24,15 +22,15 @@ GAD_ASSUME_NONNULL_BEGIN /// placement. Ad units are important for targeting and statistics. /// /// Example AdMob ad unit ID: @"ca-app-pub-0123456789012345/0123456789" -- (instancetype)initWithAdUnitID:(NSString *)adUnitID NS_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithAdUnitID:(nonnull NSString *)adUnitID NS_DESIGNATED_INITIALIZER; #pragma mark Pre-Request -/// Required value passed in with initWithAdUnitID:. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *adUnitID; +/// The interstitial's ad unit ID. +@property(nonatomic, readonly, nullable) NSString *adUnitID; /// Optional delegate object that receives state change notifications from this GADInterstitalAd. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; #pragma mark Making an Ad Request @@ -42,23 +40,21 @@ GAD_ASSUME_NONNULL_BEGIN /// This is best to do several seconds before the interstitial is needed to preload its content. /// Then when transitioning between view controllers show the interstital with /// presentFromViewController. -- (void)loadRequest:(GADRequest *GAD_NULLABLE_TYPE)request; +- (void)loadRequest:(nullable GADRequest *)request; #pragma mark Post-Request /// Returns YES if the interstitial is ready to be displayed. The delegate's /// interstitialAdDidReceiveAd: will be called after this property switches from NO to YES. -@property(nonatomic, readonly, assign) BOOL isReady; +@property(nonatomic, readonly) BOOL isReady; /// Returns YES if this object has already been presented. Interstitial objects can only be used /// once even with different requests. -@property(nonatomic, readonly, assign) BOOL hasBeenUsed; +@property(nonatomic, readonly) BOOL hasBeenUsed; -/// Returns the ad network class name that fetched the current ad. Returns nil while the latest ad -/// request is in progress or if the latest ad request failed. For both standard and mediated Google -/// AdMob ads, this property returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation -/// custom events, this property returns @"GADMAdapterCustomEvents". -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *adNetworkClassName; +/// Information about the ad response that returned the current ad. Nil while an ad +/// request is in progress or if the latest ad request failed. +@property(nonatomic, readonly, nullable) GADResponseInfo *responseInfo; /// Presents the interstitial ad which takes over the entire screen until the user dismisses it. /// This has no effect unless isReady returns YES and/or the delegate's interstitialDidReceiveAd: @@ -68,21 +64,23 @@ GAD_ASSUME_NONNULL_BEGIN /// application does not use view controllers pass in nil and your views will be removed from the /// window to show the interstitial and restored when done. After the interstitial has been removed, /// the delegate's interstitialDidDismissScreen: will be called. -- (void)presentFromRootViewController:(UIViewController *)rootViewController; +- (void)presentFromRootViewController:(nonnull UIViewController *)rootViewController; #pragma mark Deprecated -/// Deprecated delegate. GADInAppPurchase has been deprecated. -@property(nonatomic, weak, GAD_NULLABLE) - id inAppPurchaseDelegate GAD_DEPRECATED_ATTRIBUTE; +/// Deprecated delegate. GADInAppPurchase is deprecated. +@property(nonatomic, weak, nullable) id inAppPurchaseDelegate + GAD_DEPRECATED_ATTRIBUTE; /// Deprecated intializer. Use initWithAdUnitID: instead. -- (instancetype)init GAD_DEPRECATED_MSG_ATTRIBUTE("Use initWithAdUnitID:."); +- (nonnull instancetype)init GAD_DEPRECATED_MSG_ATTRIBUTE("Use initWithAdUnitID:."); /// Deprecated setter, use initWithAdUnitID: instead. -- (void)setAdUnitID:(NSString *GAD_NULLABLE_TYPE)adUnitID +- (void)setAdUnitID:(nullable NSString *)adUnitID GAD_DEPRECATED_MSG_ATTRIBUTE("Use initWithAdUnitID: instead of setting the ad unit ID."); -@end +/// Deprecated. Use responseInfo.adNetworkClassName instead. +@property(nonatomic, readonly, nullable) NSString *adNetworkClassName GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use responseInfo.adNetworkClassName."); -GAD_ASSUME_NONNULL_END +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitialDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitialDelegate.h index 4fbff885..a496e6c9 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitialDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADInterstitialDelegate.h @@ -2,21 +2,20 @@ // GADInterstitialDelegate.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // #import - #import #import @class GADInterstitial; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Delegate for receiving state change messages from a GADInterstitial such as interstitial ad /// requests succeeding/failing. -@protocol GADInterstitialDelegate +@protocol GADInterstitialDelegate @optional @@ -55,4 +54,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADMediaAspectRatio.h b/ios/platform/GoogleMobileAds.framework/Headers/GADMediaAspectRatio.h new file mode 100644 index 00000000..eba2b9bd --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADMediaAspectRatio.h @@ -0,0 +1,22 @@ +// +// GADMediaAspectRatio.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import + +/// Media aspect ratio. +typedef NS_ENUM(NSInteger, GADMediaAspectRatio) { + /// Unknown media aspect ratio. + GADMediaAspectRatioUnknown = 0, + /// Any media aspect ratio. + GADMediaAspectRatioAny = 1, + /// Landscape media aspect ratio. + GADMediaAspectRatioLandscape = 2, + /// Portrait media aspect ratio. + GADMediaAspectRatioPortrait = 3, + /// Close to square media aspect ratio. This is not a strict 1:1 aspect ratio. + GADMediaAspectRatioSquare = 4 +}; diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADMediaContent.h b/ios/platform/GoogleMobileAds.framework/Headers/GADMediaContent.h new file mode 100644 index 00000000..0d5cfa21 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADMediaContent.h @@ -0,0 +1,28 @@ +// +// GADMediaContent.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import +#import + +/// Provides media content information. Interact with instances of this class on the main queue +/// only. +@interface GADMediaContent : NSObject + +/// Media content aspect ratio (width/height). The value is 0 when there's no media content or the +/// media content aspect ratio is unknown. +@property(nonatomic, readonly) CGFloat aspectRatio; + +/// The main image to be displayed when the media content doesn't contain video. +@property(nonatomic, nullable) UIImage *mainImage; + +/// Controls the media content's video. +@property(nonatomic, readonly, nonnull) GADVideoController *videoController; + +/// Indicates whether the media content has video content. +@property(nonatomic, readonly) BOOL hasVideoContent; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADMediaView.h b/ios/platform/GoogleMobileAds.framework/Headers/GADMediaView.h index 11f7d105..67d8a2dc 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADMediaView.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADMediaView.h @@ -2,28 +2,33 @@ // GADMediaView.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2019 Google LLC. All rights reserved. // -#import - -#import +#import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN -/// Displays native ad media assets. +/// Displays native ad media content. /// -/// To display media assets in GADNativeAppInstallAdView instances, add a GADMediaView subview and -/// assign the native ad view's mediaView property. +/// To display media content in GADUnifiedNativeAdView instances, add a GADMediaView subview, +/// assign the native ad view's mediaView property, and set the native ad's mediaContent property to +/// the media view. /// -/// If the native ad doesn't contain a video and image loading is enabled, the GADMediaView displays -/// the native ad's |images| asset's first image. +/// If the native ad contains video content, the media view displays the video content. /// -/// If the native ad doesn't contain a video and image loading is disabled, the GADMediaView object -/// is empty. +/// If the native ad doesn't have video content and image loading is enabled, the media view +/// displays the first image from the native ad's |images| property. +/// +/// If the native ad doesn't have video content and image loading is disabled, the media view is +/// empty. @interface GADMediaView : UIView +/// The media content displayed in the media view. +@property(nonatomic, nullable) GADMediaContent *mediaContent; + @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADMobileAds.h b/ios/platform/GoogleMobileAds.framework/Headers/GADMobileAds.h index 80e29e55..549841f4 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADMobileAds.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADMobileAds.h @@ -2,24 +2,25 @@ // GADMobileAds.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import #import +#import +#import #import -GAD_ASSUME_NONNULL_BEGIN +/// A block called with the initialization status when [GADMobileAds startWithCompletionHandler:] +/// completes or times out. +typedef void (^GADInitializationCompletionHandler)(GADInitializationStatus *_Nonnull status); /// Google Mobile Ads SDK settings. @interface GADMobileAds : NSObject /// Returns the shared GADMobileAds instance. -+ (GADMobileAds *)sharedInstance; - -/// Configures the SDK using the settings associated with the given application ID. -+ (void)configureWithApplicationID:(NSString *)applicationID; ++ (nonnull GADMobileAds *)sharedInstance; /// Disables automated in app purchase (IAP) reporting. Must be called before any IAP transaction is /// initiated. IAP reporting is used to track IAP ad conversions. Do not disable reporting if you @@ -37,13 +38,19 @@ GAD_ASSUME_NONNULL_BEGIN /// volumes). Defaults to 1.0. @property(nonatomic, assign) float applicationVolume; -/// Indicates if the application's audio is muted. Affects initial mute state for all ads. Use this -/// method only if your application has its own volume controls (e.g., custom music or sound effect -/// muting). Defaults to NO. +/// Indicates whether the application's audio is muted. Affects initial mute state for all ads. Use +/// this method only if your application has its own volume controls (e.g., custom music or sound +/// effect muting). Defaults to NO. @property(nonatomic, assign) BOOL applicationMuted; /// Manages the Google Mobile Ads SDK's audio and video settings. -@property(nonatomic, readonly, strong) GADAudioVideoManager *audioVideoManager; +@property(nonatomic, readonly, strong, nonnull) GADAudioVideoManager *audioVideoManager; + +/// Request configuration that is common to all requests. +@property(nonatomic, readonly, strong, nonnull) GADRequestConfiguration *requestConfiguration; + +/// Initialization status of the ad networks available to the Google Mobile Ads SDK. +@property(nonatomic, nonnull, readonly) GADInitializationStatus *initializationStatus; /// Returns YES if the current SDK version is at least |major|.|minor|.|patch|. This method can be /// used by libraries that depend on a specific minimum version of the Google Mobile Ads SDK to warn @@ -54,6 +61,16 @@ GAD_ASSUME_NONNULL_BEGIN /// Ads SDK lower than 7.10 can crash the app. - (BOOL)isSDKVersionAtLeastMajor:(NSInteger)major minor:(NSInteger)minor patch:(NSInteger)patch; -@end +/// Starts the Google Mobile Ads SDK. Call this method as early as possible to reduce latency on the +/// session's first ad request. Calls completionHandler when the GMA SDK and all mediation networks +/// are fully set up or if set-up times out. The Google Mobile Ads SDK starts on the first ad +/// request if this method is not called. +- (void)startWithCompletionHandler:(nullable GADInitializationCompletionHandler)completionHandler; -GAD_ASSUME_NONNULL_END +#pragma mark Deprecated + +/// Configures the SDK using the settings associated with the given application ID. ++ (void)configureWithApplicationID:(nonnull NSString *)applicationID + GAD_DEPRECATED_MSG_ATTRIBUTE("Use [GADMobileAds.sharedInstance startWithCompletionHandler:]"); + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADMultipleAdsAdLoaderOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADMultipleAdsAdLoaderOptions.h index 81b1705a..04a6018d 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADMultipleAdsAdLoaderOptions.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADMultipleAdsAdLoaderOptions.h @@ -2,12 +2,12 @@ // GADMultipleAdsAdLoaderOptions.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Ad loader options for requesting multiple ads. Requesting multiple ads in a single request is /// currently only available for native app install ads and native content ads. @@ -24,4 +24,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADMuteThisAdReason.h b/ios/platform/GoogleMobileAds.framework/Headers/GADMuteThisAdReason.h new file mode 100644 index 00000000..6172be51 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADMuteThisAdReason.h @@ -0,0 +1,16 @@ +// +// GADMuteThisAdReason.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +/// Reason for muting the ad. +@interface GADMuteThisAdReason : NSObject + +/// Text that describes the reason for muting this ad. For example "Ad Covered Content". +@property(nonatomic, readonly, nonnull) NSString *reasonDescription; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAd.h index c454404f..620f9191 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAd.h @@ -2,15 +2,14 @@ // GADNativeAd.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import -#import - #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADNativeAdDelegate; @@ -18,19 +17,21 @@ GAD_ASSUME_NONNULL_BEGIN @interface GADNativeAd : NSObject /// Optional delegate to receive state change notifications. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; -/// Root view controller for handling ad actions. -@property(nonatomic, weak, GAD_NULLABLE) UIViewController *rootViewController; +/// Reference to a root view controller that is used by the ad to present full screen content after +/// the user interacts with the ad. The root view controller is most commonly the view controller +/// displaying the ad. +@property(nonatomic, weak, nullable) UIViewController *rootViewController; /// Dictionary of assets which aren't processed by the receiver. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSDictionary *extraAssets; +@property(nonatomic, readonly, copy, nullable) NSDictionary *extraAssets; /// The ad network class name that fetched the current ad. For both standard and mediated Google /// AdMob ads, this method returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation /// custom events, this method returns @"GADMAdapterCustomEvents". -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *adNetworkClassName; +@property(nonatomic, readonly, copy, nullable) NSString *adNetworkClassName; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdDelegate.h index e1b3ba3e..b20be1d1 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdDelegate.h @@ -2,19 +2,18 @@ // GADNativeAdDelegate.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import @class GADNativeAd; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Identifies native ad assets. -@protocol GADNativeAdDelegate +@protocol GADNativeAdDelegate @optional @@ -54,4 +53,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage+Mediation.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage+Mediation.h index 971b7146..469f72cd 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage+Mediation.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage+Mediation.h @@ -8,7 +8,7 @@ #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Provides additional GADNativeAdImage initializers. @interface GADNativeAdImage (MediationAdditions) @@ -21,4 +21,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage.h index df4b4868..618bb5ab 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImage.h @@ -2,28 +2,27 @@ // GADNativeAdImage.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import -#import - #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Native ad image. @interface GADNativeAdImage : NSObject /// The image. If image autoloading is disabled, this property will be nil. -@property(nonatomic, readonly, strong, GAD_NULLABLE) UIImage *image; +@property(nonatomic, readonly, strong, nullable) UIImage *image; /// The image's URL. -@property(nonatomic, readonly, copy) NSURL *imageURL; +@property(nonatomic, readonly, copy, nullable) NSURL *imageURL; /// The image's scale. @property(nonatomic, readonly, assign) CGFloat scale; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImageAdLoaderOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImageAdLoaderOptions.h index 4e4d70ba..ec569dcc 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImageAdLoaderOptions.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdImageAdLoaderOptions.h @@ -2,13 +2,13 @@ // GADNativeAdImageAdLoaderOptions.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Native ad image orientation preference. typedef NS_ENUM(NSInteger, GADNativeAdImageAdLoaderOptionsOrientation) { @@ -20,18 +20,22 @@ typedef NS_ENUM(NSInteger, GADNativeAdImageAdLoaderOptionsOrientation) { /// Ad loader options for native ad image settings. @interface GADNativeAdImageAdLoaderOptions : GADAdLoaderOptions -/// Indicates if image asset content should be loaded by the SDK. If set to YES, the SDK will not -/// load image asset content and native ad image URLs can be used to fetch content. Defaults to NO, -/// image assets are loaded by the SDK. +/// Indicates whether image asset content should be loaded by the SDK. If set to YES, the SDK will +/// not load image asset content and native ad image URLs can be used to fetch content. Defaults to +/// NO, image assets are loaded by the SDK. @property(nonatomic, assign) BOOL disableImageLoading; -/// Indicates if multiple images should be loaded for each asset. Defaults to NO. +/// Indicates whether multiple images should be loaded for each asset. Defaults to NO. @property(nonatomic, assign) BOOL shouldRequestMultipleImages; +#pragma mark - Deprecated + /// Indicates preferred image orientation. Defaults to /// GADNativeAdImageAdLoaderOptionsOrientationAny. -@property(nonatomic, assign) GADNativeAdImageAdLoaderOptionsOrientation preferredImageOrientation; +@property(nonatomic, assign) + GADNativeAdImageAdLoaderOptionsOrientation preferredImageOrientation DEPRECATED_MSG_ATTRIBUTE( + "Use the mediaAspectRatio property from GADNativeAdMediaAdLoaderOptions instead."); @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdMediaAdLoaderOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdMediaAdLoaderOptions.h new file mode 100644 index 00000000..52bcc680 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdMediaAdLoaderOptions.h @@ -0,0 +1,20 @@ +// +// GADNativeAdMediaAdLoaderOptions.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import +#import +#import + +/// Ad loader options for native ad media settings. +@interface GADNativeAdMediaAdLoaderOptions : GADAdLoaderOptions + +/// Image and video aspect ratios. Defaults to GADMediaAspectRatioUnknown. Portrait, landscape, and +/// square aspect ratios are returned when this property is GADMediaAspectRatioUnknown or +/// GADMediaAspectRatioAny. +@property(nonatomic, assign) GADMediaAspectRatio mediaAspectRatio; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdViewAdOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdViewAdOptions.h index cd22062c..33b98b04 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdViewAdOptions.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAdViewAdOptions.h @@ -2,13 +2,13 @@ // GADNativeAdViewAdOptions.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Position of the AdChoices icon in the containing ad. typedef NS_ENUM(NSInteger, GADAdChoicesPosition) { @@ -26,4 +26,4 @@ typedef NS_ENUM(NSInteger, GADAdChoicesPosition) { @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAppInstallAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAppInstallAd.h deleted file mode 100644 index 89cfbd98..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAppInstallAd.h +++ /dev/null @@ -1,118 +0,0 @@ -// -// GADNativeAppInstallAd.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google Inc. All rights reserved. -// - -#import -#import - -#import -#import -#import -#import -#import -#import -#import -#import - -GAD_ASSUME_NONNULL_BEGIN - -/// Native app install ad. To request this ad type, you need to pass -/// kGADAdLoaderAdTypeNativeAppInstall (see GADAdLoaderAdTypes.h) to the |adTypes| parameter in -/// GADAdLoader's initializer method. If you request this ad type, your delegate must conform to the -/// GADNativeAppInstallAdLoaderDelegate protocol. -@interface GADNativeAppInstallAd : GADNativeAd - -#pragma mark - Must be displayed - -/// App title. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *headline; -/// Text that encourages user to take some action with the ad. For example "Install". -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *callToAction; -/// Application icon. -@property(nonatomic, readonly, strong, GAD_NULLABLE) GADNativeAdImage *icon; - -#pragma mark - Recommended to display - -/// App description. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *body; -/// The app store name. For example, "App Store". -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *store; -/// String representation of the app's price. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *price; -/// Array of GADNativeAdImage objects related to the advertised application. -@property(nonatomic, readonly, strong, GAD_NULLABLE) NSArray *images; -/// App store rating (0 to 5). -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSDecimalNumber *starRating; -/// Video controller for controlling video playback in GADNativeAppInstallAdView's mediaView. -@property(nonatomic, strong, readonly) GADVideoController *videoController; - -/// Registers ad view and asset views with this native ad. -/// @param assetViews Dictionary of asset views keyed by asset IDs. -- (void)registerAdView:(UIView *)adView - assetViews:(NSDictionary *)assetViews - GAD_DEPRECATED_MSG_ATTRIBUTE("Use -registerAdView:clickableAssetViews:nonclickableAssetViews:"); - -/// Registers ad view, clickable asset views, and nonclickable asset views with this native ad. -/// Media view shouldn't be registered as clickable. -/// @param clickableAssetViews Dictionary of asset views that are clickable, keyed by asset IDs. -/// @param nonclickableAssetViews Dictionary of asset views that are not clickable, keyed by asset -/// IDs. -- (void)registerAdView:(UIView *)adView - clickableAssetViews:(NSDictionary *)clickableAssetViews - nonclickableAssetViews: - (NSDictionary *)nonclickableAssetViews; - -/// Unregisters ad view from this native ad. The corresponding asset views will also be -/// unregistered. -- (void)unregisterAdView; - -@end - -#pragma mark - Protocol and constants - -/// The delegate of a GADAdLoader object implements this protocol to receive GADNativeAppInstallAd -/// ads. -@protocol GADNativeAppInstallAdLoaderDelegate -/// Called when a native app install ad is received. -- (void)adLoader:(GADAdLoader *)adLoader - didReceiveNativeAppInstallAd:(GADNativeAppInstallAd *)nativeAppInstallAd; -@end - -#pragma mark - Native App Install Ad View - -/// Base class for app install ad views. Your app install ad view must be a subclass of this class -/// and must call superclass methods for all overriden methods. -@interface GADNativeAppInstallAdView : UIView - -/// This property must point to the native app install ad object rendered by this ad view. -@property(nonatomic, strong, GAD_NULLABLE) GADNativeAppInstallAd *nativeAppInstallAd; - -/// Weak reference to your ad view's headline asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *headlineView; -/// Weak reference to your ad view's call to action asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *callToActionView; -/// Weak reference to your ad view's icon asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *iconView; -/// Weak reference to your ad view's body asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *bodyView; -/// Weak reference to your ad view's store asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *storeView; -/// Weak reference to your ad view's price asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *priceView; -/// Weak reference to your ad view's image asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *imageView; -/// Weak reference to your ad view's star rating asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *starRatingView; -/// Weak reference to your ad view's media asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet GADMediaView *mediaView; -/// Weak reference to your ad view's AdChoices view. Must set adChoicesView before setting -/// nativeAppInstallAd, otherwise AdChoices will be rendered in the publisher's -/// preferredAdChoicesPosition as defined in GADNativeAdViewAdOptions. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet GADAdChoicesView *adChoicesView; - -@end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAppInstallAdAssetIDs.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAppInstallAdAssetIDs.h deleted file mode 100644 index 710f491f..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeAppInstallAdAssetIDs.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// GADNativeAppInstallAdAssetIDs.h -// Google Mobile Ads SDK -// -// Copyright 2017 Google Inc. All rights reserved. -// - -#import - -#import - -GAD_ASSUME_NONNULL_BEGIN - -typedef NSString *GADNativeAppInstallAssetID GAD_STRING_ENUM; - -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallHeadlineAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallCallToActionAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallIconAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallBodyAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallStoreAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallPriceAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallImageAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallStarRatingAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallAttributionIconAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallAttributionTextAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallMediaViewAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallAdChoicesViewAsset; -GAD_EXTERN GADNativeAppInstallAssetID const GADNativeAppInstallBackgroundAsset; - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeContentAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeContentAd.h deleted file mode 100644 index 512846c9..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeContentAd.h +++ /dev/null @@ -1,111 +0,0 @@ -// -// GADNativeContentAd.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google Inc. All rights reserved. -// - -#import -#import - -#import -#import -#import -#import -#import -#import -#import -#import - -GAD_ASSUME_NONNULL_BEGIN - -#pragma mark - Native Content Ad Assets - -/// Native content ad. To request this ad type, you need to pass kGADAdLoaderAdTypeNativeContent -/// (see GADAdLoaderAdTypes.h) to the |adTypes| parameter in GADAdLoader's initializer method. If -/// you request this ad type, your delegate must conform to the GADNativeContentAdLoaderDelegate -/// protocol. -@interface GADNativeContentAd : GADNativeAd - -#pragma mark - Must be displayed - -/// Primary text headline. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *headline; -/// Secondary text. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *body; - -#pragma mark - Recommended to display - -/// Large images. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSArray *images; -/// Small logo image. -@property(nonatomic, readonly, strong, GAD_NULLABLE) GADNativeAdImage *logo; -/// Text that encourages user to take some action with the ad. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *callToAction; -/// Identifies the advertiser. For example, the advertiser’s name or visible URL. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *advertiser; -/// Video controller for controlling video playback in GADNativeContentAdView's mediaView. -@property(nonatomic, strong, readonly) GADVideoController *videoController; - -/// Registers ad view and asset views created with this native ad. -/// @param assetViews Dictionary of asset views keyed by asset IDs. -- (void)registerAdView:(UIView *)adView - assetViews:(NSDictionary *)assetViews - GAD_DEPRECATED_MSG_ATTRIBUTE("Use -registerAdView:clickableAssetViews:nonclickableAssetViews:"); - -/// Registers ad view, clickable asset views, and nonclickable asset views with this native ad. -/// Media view shouldn't be registered as clickable. -/// @param clickableAssetViews Dictionary of asset views that are clickable, keyed by asset IDs. -/// @param nonclickableAssetViews Dictionary of asset views that are not clickable, keyed by asset -/// IDs. -- (void)registerAdView:(UIView *)adView - clickableAssetViews:(NSDictionary *)clickableAssetViews - nonclickableAssetViews: - (NSDictionary *)nonclickableAssetViews; - -/// Unregisters ad view from this native ad. The corresponding asset views will also be -/// unregistered. -- (void)unregisterAdView; - -@end - -#pragma mark - Protocol and constants - -/// The delegate of a GADAdLoader object implements this protocol to receive GADNativeContentAd ads. -@protocol GADNativeContentAdLoaderDelegate -/// Called when native content is received. -- (void)adLoader:(GADAdLoader *)adLoader - didReceiveNativeContentAd:(GADNativeContentAd *)nativeContentAd; -@end - -#pragma mark - Native Content Ad View - -/// Base class for content ad views. Your content ad view must be a subclass of this class and must -/// call superclass methods for all overriden methods. -@interface GADNativeContentAdView : UIView - -/// This property must point to the native content ad object rendered by this ad view. -@property(nonatomic, strong, GAD_NULLABLE) GADNativeContentAd *nativeContentAd; - -/// Weak reference to your ad view's headline asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *headlineView; -/// Weak reference to your ad view's body asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *bodyView; -/// Weak reference to your ad view's image asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *imageView; -/// Weak reference to your ad view's logo asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *logoView; -/// Weak reference to your ad view's call to action asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *callToActionView; -/// Weak reference to your ad view's advertiser asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIView *advertiserView; -/// Weak reference to your ad view's media asset view. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet GADMediaView *mediaView; -/// Weak reference to your ad view's AdChoices view. Must set adChoicesView before setting -/// nativeContentAd, otherwise AdChoices will be rendered in the publisher's -/// preferredAdChoicesPosition as defined in GADNativeAdViewAdOptions. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet GADAdChoicesView *adChoicesView; - -@end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeContentAdAssetIDs.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeContentAdAssetIDs.h deleted file mode 100644 index 78ba54e9..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeContentAdAssetIDs.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// GADNativeContentAdAssetIDs.h -// Google Mobile Ads SDK -// -// Copyright 2017 Google Inc. All rights reserved. -// - -#import - -#import - -GAD_ASSUME_NONNULL_BEGIN - -typedef NSString *GADNativeContentAdAssetID GAD_STRING_ENUM; - -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentHeadlineAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentBodyAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentCallToActionAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentAdvertiserAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentImageAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentLogoAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentAttributionIconAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentAttributionTextAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentMediaViewAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentAdChoicesViewAsset; -GAD_EXTERN GADNativeContentAdAssetID const GADNativeContentBackgroundAsset; - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeCustomTemplateAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeCustomTemplateAd.h index 2fb39621..fdf69d44 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeCustomTemplateAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeCustomTemplateAd.h @@ -2,20 +2,20 @@ // GADNativeCustomTemplateAd.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import -#import - #import +#import #import #import #import #import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Native ad custom click handler block. |assetID| is the ID of asset that has received a click. typedef void (^GADNativeAdCustomClickHandler)(NSString *assetID); @@ -24,9 +24,9 @@ typedef void (^GADNativeAdCustomClickHandler)(NSString *assetID); GAD_EXTERN NSString *const GADNativeCustomTemplateAdMediaViewKey; /// Native custom template ad. To request this ad type, you need to pass -/// kGADAdLoaderAdTypeNativeCustomTemplate (see GADAdLoaderAdTypes.h) to the |adTypes| parameter in -/// GADAdLoader's initializer method. If you request this ad type, your delegate must conform to the -/// GADNativeCustomTemplateAdLoaderDelegate protocol. +/// kGADAdLoaderAdTypeNativeCustomTemplate (see GADAdLoaderAdTypes.h) to the |adTypes| parameter +/// in GADAdLoader's initializer method. If you request this ad type, your delegate must conform to +/// the GADNativeCustomTemplateAdLoaderDelegate protocol. @interface GADNativeCustomTemplateAd : GADNativeAd /// The ad's custom template ID. @@ -40,20 +40,23 @@ GAD_EXTERN NSString *const GADNativeCustomTemplateAdMediaViewKey; /// Returns media view for rendering video loaded by the receiver. Returns nil if receiver doesn't /// has a video. -@property(nonatomic, readonly, strong, GAD_NULLABLE) GADMediaView *mediaView; +@property(nonatomic, readonly, strong, nullable) GADMediaView *mediaView; /// Custom click handler. Set this property only if this template ad is configured with a custom /// click action, otherwise set it to nil. If this property is set to a non-nil value, the ad's /// built-in click actions are ignored and |customClickHandler| is executed when a click on the /// asset is received. -@property(atomic, copy, GAD_NULLABLE) GADNativeAdCustomClickHandler customClickHandler; +@property(atomic, copy, nullable) GADNativeAdCustomClickHandler customClickHandler; + +/// The display ad measurement associated with this ad. +@property(nonatomic, readonly, nullable) GADDisplayAdMeasurement *displayAdMeasurement; /// Returns the native ad image corresponding to the specified key or nil if the image is not /// available. -- (GADNativeAdImage *GAD_NULLABLE_TYPE)imageForKey:(NSString *)key; +- (nullable GADNativeAdImage *)imageForKey:(NSString *)key; /// Returns the string corresponding to the specified key or nil if the string is not available. -- (NSString *GAD_NULLABLE_TYPE)stringForKey:(NSString *)key; +- (nullable NSString *)stringForKey:(NSString *)key; /// Call when the user clicks on the ad. Provide the asset key that best matches the asset the user /// interacted with. If this ad is configured with a custom click action, ensure the receiver's @@ -71,7 +74,7 @@ GAD_EXTERN NSString *const GADNativeCustomTemplateAdMediaViewKey; /// /// This method is deprecated. See performClickOnAssetWithKey: API. - (void)performClickOnAssetWithKey:(NSString *)assetKey - customClickHandler:(dispatch_block_t GAD_NULLABLE_TYPE)customClickHandler + customClickHandler:(nullable dispatch_block_t)customClickHandler GAD_DEPRECATED_MSG_ATTRIBUTE("Use performClickOnAssetWithKey:."); @end @@ -80,7 +83,7 @@ GAD_EXTERN NSString *const GADNativeCustomTemplateAdMediaViewKey; /// The delegate of a GADAdLoader object implements this protocol to receive /// GADNativeCustomTemplateAd ads. -@protocol GADNativeCustomTemplateAdLoaderDelegate +@protocol GADNativeCustomTemplateAdLoaderDelegate /// Called when requesting an ad. Asks the delegate for an array of custom template ID strings. - (NSArray *)nativeCustomTemplateIDsForAdLoader:(GADAdLoader *)adLoader; @@ -91,4 +94,4 @@ GAD_EXTERN NSString *const GADNativeCustomTemplateAdMediaViewKey; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdView.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdView.h index ed93885c..1a0c48f1 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdView.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdView.h @@ -2,18 +2,17 @@ // GADNativeExpressAdView.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // -#import - #import #import #import #import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// The view that displays native ads. A minimum implementation to get an ad from within a /// UIViewController class is: @@ -36,11 +35,11 @@ GAD_DEPRECATED_ATTRIBUTE /// Returns an initialized GADNativeExpressAdView instance set to |adSize| and positioned at /// |origin| relative to its superview bounds. Returns nil if |adSize| is an invalid ad size. -- (instancetype GAD_NULLABLE_TYPE)initWithAdSize:(GADAdSize)adSize origin:(CGPoint)origin; +- (nullable instancetype)initWithAdSize:(GADAdSize)adSize origin:(CGPoint)origin; -/// Returns an initialized GADNativeExpressAdView instance set to |adSize| and positioned at the top -/// left of its superview. Returns nil if |adSize| is an invalid ad size. -- (instancetype GAD_NULLABLE_TYPE)initWithAdSize:(GADAdSize)adSize; +/// Returns an initialized GADNativeExpressAdView instance set to |adSize| and positioned at the +/// top left of its superview. Returns nil if |adSize| is an invalid ad size. +- (nullable instancetype)initWithAdSize:(GADAdSize)adSize; /// Video controller for controlling video rendered by this native express ad view. @property(nonatomic, strong, readonly) GADVideoController *videoController; @@ -52,11 +51,11 @@ GAD_DEPRECATED_ATTRIBUTE /// important for targeting and statistics. /// /// Example AdMob ad unit ID: @"ca-app-pub-0123456789012345/0123456789" -@property(nonatomic, copy, GAD_NULLABLE) IBInspectable NSString *adUnitID; +@property(nonatomic, copy, nullable) IBInspectable NSString *adUnitID; /// Required reference to the current root view controller. For example, the root view controller in /// a tab-based application would be the UITabViewController. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet UIViewController *rootViewController; +@property(nonatomic, weak, nullable) IBOutlet UIViewController *rootViewController; /// Required to set this native ad view to a proper size. Never create your own GADAdSize directly. /// Use one of the predefined standard ad sizes (such as kGADAdSizeBanner), or create one using the @@ -67,7 +66,7 @@ GAD_DEPRECATED_ATTRIBUTE /// Optional delegate object that receives state change notifications from this /// GADNativeExpressAdView. Typically this is a UIViewController. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id delegate; +@property(nonatomic, weak, nullable) IBOutlet id delegate; /// A Boolean value that determines whether autoloading of ads in the receiver is enabled. If /// enabled, you do not need to call the loadRequest: method to load ads. @@ -82,16 +81,16 @@ GAD_DEPRECATED_ATTRIBUTE #pragma mark - Making an Ad Request /// Makes an ad request. The request object supplies targeting information. -- (void)loadRequest:(GADRequest *GAD_NULLABLE_TYPE)request; +- (void)loadRequest:(nullable GADRequest *)request; #pragma mark - Mediation /// The name of the ad network adapter class that fetched the current ad. Returns nil while the /// latest ad request is in progress or if the latest ad request failed. For both standard and -/// mediated Google AdMob ads, this method returns @"GADMAdapterGoogleAdMobAds". For ads fetched via -/// mediation custom events, this method returns @"GADMAdapterCustomEvents". -@property(nonatomic, readonly, weak, GAD_NULLABLE) NSString *adNetworkClassName; +/// mediated Google AdMob ads, this method returns @"GADMAdapterGoogleAdMobAds". For ads fetched +/// via mediation custom events, this method returns @"GADMAdapterCustomEvents". +@property(nonatomic, readonly, weak, nullable) NSString *adNetworkClassName; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdViewDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdViewDelegate.h index 96046e22..6d0bec69 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdViewDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeExpressAdViewDelegate.h @@ -2,21 +2,20 @@ // GADNativeExpressAdViewDelegate.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import #import @class GADNativeExpressAdView; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Delegate methods for receiving GADNativeExpressAdView state change messages such as ad request /// status and ad click lifecycle. -@protocol GADNativeExpressAdViewDelegate +@protocol GADNativeExpressAdViewDelegate @optional @@ -51,4 +50,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADNativeMuteThisAdLoaderOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeMuteThisAdLoaderOptions.h new file mode 100644 index 00000000..b0f33232 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADNativeMuteThisAdLoaderOptions.h @@ -0,0 +1,16 @@ +// +// GADNativeMuteThisAdLoaderOptions.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +/// Mute This Ad options. +@interface GADNativeMuteThisAdLoaderOptions : GADAdLoaderOptions + +/// Set to YES to request the custom Mute This Ad feature. By default, this property's value is YES. +@property(nonatomic) BOOL customMuteThisAdRequested; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRequest.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRequest.h index 5aa7f27c..0fd560a6 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADRequest.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRequest.h @@ -2,16 +2,15 @@ // GADRequest.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // #import #import - #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Add this constant to the testDevices property's array to receive test ads on the simulator. GAD_EXTERN const id kGADSimulatorID; @@ -24,7 +23,7 @@ typedef NS_ENUM(NSInteger, GADGender) { }; /// Specifies optional parameters for ad requests. -@interface GADRequest : NSObject +@interface GADRequest : NSObject /// Returns a default request. + (instancetype)request; @@ -40,7 +39,7 @@ typedef NS_ENUM(NSInteger, GADGender) { - (void)registerAdNetworkExtras:(id)extras; /// Returns the network extras defined for an ad network. -- (id GAD_NULLABLE_TYPE)adNetworkExtrasFor:(Class)aClass; +- (nullable id)adNetworkExtrasFor:(Class)aClass; /// Removes the extras for an ad network. |aClass| is the class which represents that network's /// extras type. @@ -54,7 +53,7 @@ typedef NS_ENUM(NSInteger, GADGender) { #pragma mark Testing /// Test ads will be returned for devices with device IDs specified in this array. -@property(nonatomic, copy, GAD_NULLABLE) NSArray *testDevices; +@property(nonatomic, copy, nullable) NSArray *testDevices; #pragma mark User Information @@ -65,34 +64,15 @@ typedef NS_ENUM(NSInteger, GADGender) { longitude:(CGFloat)longitude accuracy:(CGFloat)accuracyInMeters; -/// [Optional] This method allows you to specify whether you would like your app to be treated as -/// child-directed for purposes of the Children’s Online Privacy Protection Act (COPPA), -/// http:///business.ftc.gov/privacy-and-security/childrens-privacy. -/// -/// If you call this method with YES, you are indicating that your app should be treated as -/// child-directed for purposes of the Children’s Online Privacy Protection Act (COPPA). If you call -/// this method with NO, you are indicating that your app should not be treated as child-directed -/// for purposes of the Children’s Online Privacy Protection Act (COPPA). If you do not call this -/// method, ad requests will include no indication of how you would like your app treated with -/// respect to COPPA. -/// -/// By setting this method, you certify that this notification is accurate and you are authorized to -/// act on behalf of the owner of the app. You understand that abuse of this setting may result in -/// termination of your Google account. -/// -/// It may take some time for this designation to be fully implemented in applicable Google -/// services. This designation will only apply to ad requests for which you have set this method. -- (void)tagForChildDirectedTreatment:(BOOL)childDirectedTreatment; - #pragma mark Contextual Information /// Array of keyword strings. Keywords are words or phrases describing the current user activity /// such as @"Sports Scores" or @"Football". Set this property to nil to clear the keywords. -@property(nonatomic, copy, GAD_NULLABLE) NSArray *keywords; +@property(nonatomic, copy, nullable) NSArray *keywords; -/// URL string for a webpage whose content matches the app content. This webpage content is used for -/// targeting purposes. -@property(nonatomic, copy, GAD_NULLABLE) NSString *contentURL; +/// URL string for a webpage whose content matches the app's primary content. This webpage content +/// is used for targeting and brand safety purposes. +@property(nonatomic, copy, nullable) NSString *contentURL; #pragma mark Request Agent Information @@ -100,7 +80,7 @@ typedef NS_ENUM(NSInteger, GADGender) { /// Ads SDK should set this property to denote the platform from which the ad request originated. /// For example, a third party ad network called "CoolAds network" that is mediating requests to the /// Mobile Ads SDK should set this property as "CoolAds". -@property(nonatomic, copy, GAD_NULLABLE) NSString *requestAgent; +@property(nonatomic, copy, nullable) NSString *requestAgent; #pragma mark Deprecated Methods @@ -108,17 +88,40 @@ typedef NS_ENUM(NSInteger, GADGender) { @property(nonatomic, assign) GADGender gender GAD_DEPRECATED_ATTRIBUTE; /// Deprecated property. The user's birthday. -@property(nonatomic, copy, GAD_NULLABLE) NSDate *birthday GAD_DEPRECATED_ATTRIBUTE; +@property(nonatomic, copy, nullable) NSDate *birthday GAD_DEPRECATED_ATTRIBUTE; -/// Deprecated. +/// Provide the user's birthday to increase ad relevancy. - (void)setBirthdayWithMonth:(NSInteger)month day:(NSInteger)day year:(NSInteger)year GAD_DEPRECATED_ATTRIBUTE; -/// Deprecated. -- (void)setLocationWithDescription:(NSString *GAD_NULLABLE_TYPE)locationDescription +/// When Core Location isn't available but the user's location is known, supplying it here may +/// deliver more relevant ads. It can be any free-form text such as @"Champs-Elysees Paris" or +/// @"94041 US". +- (void)setLocationWithDescription:(nullable NSString *)locationDescription GAD_DEPRECATED_MSG_ATTRIBUTE(" use setLocationWithLatitude:longitude:accuracy:."); +/// [Optional] This method allows you to specify whether you would like your app to be treated as +/// child-directed for purposes of the Children’s Online Privacy Protection Act (COPPA), +/// http://business.ftc.gov/privacy-and-security/childrens-privacy. +/// +/// If you call this method with YES, you are indicating that your app should be treated as +/// child-directed for purposes of the Children’s Online Privacy Protection Act (COPPA). If you call +/// this method with NO, you are indicating that your app should not be treated as child-directed +/// for purposes of the Children’s Online Privacy Protection Act (COPPA). If you do not call this +/// method, ad requests will include no indication of how you would like your app treated with +/// respect to COPPA. +/// +/// By setting this method, you certify that this notification is accurate and you are authorized to +/// act on behalf of the owner of the app. You understand that abuse of this setting may result in +/// termination of your Google account. +/// +/// It may take some time for this designation to be fully implemented in applicable Google +/// services. This designation will only apply to ad requests for which you have set this method. +- (void)tagForChildDirectedTreatment:(BOOL)childDirectedTreatment + GAD_DEPRECATED_MSG_ATTRIBUTE( + " use [GADMobileAds.sharedInstance.requestConfiguration tagForChildDirectedTreatment]"); + @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h new file mode 100644 index 00000000..219caeb2 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h @@ -0,0 +1,55 @@ +// +// GADRequestConfiguration.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +#import + +/// Maximum ad content rating. +typedef NSString *GADMaxAdContentRating NS_STRING_ENUM; + +/// Rating for content suitable for general audiences, including families. +GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingGeneral; +/// Rating for content suitable for most audiences with parental guidance. +GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingParentalGuidance; +/// Rating for content suitable for teen and older audiences. +GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingTeen; +/// Rating for content suitable only for mature audiences. +GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingMatureAudience; + +/// Request configuration. The settings in this class will apply to all ad requests. +@interface GADRequestConfiguration : NSObject + +/// The maximum ad content rating. All Google ads will have this content rating or lower. +@property(nonatomic, copy, nullable) GADMaxAdContentRating maxAdContentRating; + +/// This method allows you to specify whether the user is under the age of consent. +/// https://developers.google.com/admob/ios/targeting#users_under_the_age_of_consent. +/// +/// If you call this method with YES, a TFUA parameter will be included in all ad requests. This +/// parameter disables personalized advertising, including remarketing, for all ad requests. It also +/// disables requests to third-party ad vendors, such as ad measurement pixels and third-party ad +/// servers. +- (void)tagForUnderAgeOfConsent:(BOOL)underAgeOfConsent; + +/// [Optional] This method allows you to specify whether you would like your app to be treated as +/// child-directed for purposes of the Children’s Online Privacy Protection Act (COPPA), +/// http://business.ftc.gov/privacy-and-security/childrens-privacy. +/// +/// If you call this method with YES, you are indicating that your app should be treated as +/// child-directed for purposes of the Children’s Online Privacy Protection Act (COPPA). If you call +/// this method with NO, you are indicating that your app should not be treated as child-directed +/// for purposes of the Children’s Online Privacy Protection Act (COPPA). If you do not call this +/// method, ad requests will include no indication of how you would like your app treated with +/// respect to COPPA. +/// +/// By setting this method, you certify that this notification is accurate and you are authorized to +/// act on behalf of the owner of the app. You understand that abuse of this setting may result in +/// termination of your Google account. +- (void)tagForChildDirectedTreatment:(BOOL)childDirectedTreatment; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRequestError.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRequestError.h index b38dcbe8..3795a481 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADRequestError.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRequestError.h @@ -2,16 +2,15 @@ // GADRequestError.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // #import - #import @class GADRequest; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Google AdMob Ads error domain. GAD_EXTERN NSString *const kGADErrorDomain; @@ -60,11 +59,14 @@ typedef NS_ENUM(NSInteger, GADErrorCode) { kGADErrorInvalidArgument, /// Received invalid response. - kGADErrorReceivedInvalidResponse + kGADErrorReceivedInvalidResponse, + + /// Will not send request because the rewarded ad object has already been used. + kGADErrorRewardedAdAlreadyUsed, }; /// Represents the error generated due to invalid request parameters. @interface GADRequestError : NSError @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADResponseInfo.h b/ios/platform/GoogleMobileAds.framework/Headers/GADResponseInfo.h new file mode 100644 index 00000000..011e36c9 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADResponseInfo.h @@ -0,0 +1,25 @@ +// +// GADResponseInfo.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google LLC. All rights reserved. +// + +#import + +/// Ad network class name for ads returned from Google's ad network. +extern NSString *_Nonnull const GADGoogleAdNetworkClassName; + +/// Ad network class name for custom event ads. +extern NSString *_Nonnull const GADCustomEventAdNetworkClassName; + +/// Information about a response to an ad request. +@interface GADResponseInfo : NSObject + +/// Unique identifier of the ad response. +@property(nonatomic, readonly, nullable) NSString *responseIdentifier; + +/// A class name that identifies the ad network that returned the ad. +@property(nonatomic, readonly, nonnull) NSString *adNetworkClassName; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAd.h index 6a27aa50..e7c9f39a 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAd.h @@ -2,51 +2,54 @@ // GADRewardBasedVideoAd.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import -#import - +#import #import -#import - -@protocol GADRewardBasedVideoAdDelegate; - -GAD_ASSUME_NONNULL_BEGIN +#import +#import +#import /// The GADRewardBasedVideoAd class is used for requesting and presenting a reward based video ad. /// This class isn't thread safe. @interface GADRewardBasedVideoAd : NSObject /// Delegate for receiving video notifications. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; -/// Indicates if the receiver is ready to be presented full screen. +/// Indicates whether the receiver is ready to be presented full screen. @property(nonatomic, readonly, getter=isReady) BOOL ready; /// The ad network class name that fetched the current ad. Returns nil while the latest ad request /// is in progress or if the latest ad request failed. For both standard and mediated Google AdMob /// ads, this property returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation custom /// events, this property returns the mediated custom event adapter. -@property(nonatomic, readonly, copy, GAD_NULLABLE) NSString *adNetworkClassName; +@property(nonatomic, readonly, copy, nullable) NSString *adNetworkClassName; /// A unique identifier used to identify the user when making server-to-server reward callbacks. /// This value is used at both request time and during ad display. New values must only be set /// before ad requests. -@property(nonatomic, copy, GAD_NULLABLE) NSString *userIdentifier; +@property(nonatomic, copy, nullable) NSString *userIdentifier; + +/// Optional custom reward string to include in the server-to-server callback. +@property(nonatomic, copy, nullable) NSString *customRewardString; + +/// The loaded ad's metadata. Is nil if no ad is loaded or the loaded ad doesn't have metadata. Ad +/// metadata may update after loading. Use the rewardBasedVideoAdMetadataDidChange: delegate method +/// on GADRewardBasedVideoAdDelegate to listen for updates. +@property(nonatomic, readonly, nullable) NSDictionary *adMetadata; /// Returns the shared GADRewardBasedVideoAd instance. -+ (GADRewardBasedVideoAd *)sharedInstance; ++ (nonnull GADRewardBasedVideoAd *)sharedInstance; /// Initiates the request to fetch the reward based video ad. The |request| object supplies ad /// targeting information and must not be nil. The adUnitID is the ad unit id used for fetching an /// ad and must not be nil. -- (void)loadRequest:(GADRequest *)request withAdUnitID:(NSString *)adUnitID; +- (void)loadRequest:(nonnull GADRequest *)request withAdUnitID:(nonnull NSString *)adUnitID; /// Presents the reward based video ad with the provided view controller. -- (void)presentFromRootViewController:(UIViewController *)viewController; +- (void)presentFromRootViewController:(nonnull UIViewController *)viewController; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAdDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAdDelegate.h index 9d91f600..baf8b300 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAdDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardBasedVideoAdDelegate.h @@ -2,20 +2,20 @@ // GADRewardBasedVideoAdDelegate.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import -#import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN + +@class GADRewardBasedVideoAd; /// Delegate for receiving state change messages from a GADRewardBasedVideoAd such as ad requests /// succeeding/failing. -@protocol GADRewardBasedVideoAdDelegate +@protocol GADRewardBasedVideoAdDelegate @required @@ -47,6 +47,10 @@ GAD_ASSUME_NONNULL_BEGIN /// Tells the delegate that the reward based video ad will leave the application. - (void)rewardBasedVideoAdWillLeaveApplication:(GADRewardBasedVideoAd *)rewardBasedVideoAd; +/// Tells the delegate that the reward based video ad's metadata changed. Called when an ad loads, +/// and when a loaded ad's metadata changes. +- (void)rewardBasedVideoAdMetadataDidChange:(GADRewardBasedVideoAd *)rewardBasedVideoAd; + @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAd.h new file mode 100644 index 00000000..4f14a82f --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAd.h @@ -0,0 +1,76 @@ +// +// GADRewardedAd.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import +#import +#import +#import +#import +#import + +/// A block to be executed when the ad request operation completes. If the load failed, the error +/// object is non-null and provides failure information. On success, |error| is nil. +typedef void (^GADRewardedAdLoadCompletionHandler)(GADRequestError *_Nullable error); + +/// The GADRewardedAd class is used for requesting and presenting a rewarded ad. +@interface GADRewardedAd : NSObject + +/// Initializes a rewarded ad with the provided ad unit ID. Create ad unit IDs using the AdMob +/// website for each unique ad placement in your app. Unique ad units improve targeting and +/// statistics. +/// +/// Example AdMob ad unit ID: @"ca-app-pub-3940256099942544/1712485313" +- (nonnull instancetype)initWithAdUnitID:(nonnull NSString *)adUnitID; + +/// Requests an rewarded ad and calls the provided completion handler when the request finishes. +- (void)loadRequest:(nullable GADRequest *)request + completionHandler:(nullable GADRewardedAdLoadCompletionHandler)completionHandler; + +/// The ad unit ID. +@property(nonatomic, readonly, nonnull) NSString *adUnitID; + +/// Indicates whether the rewarded ad is ready to be presented. +@property(nonatomic, readonly, getter=isReady) BOOL ready; + +/// Information about the ad response that returned the current ad. Nil while an ad +/// request is in progress or if the latest ad request failed. +@property(nonatomic, readonly, nullable) GADResponseInfo *responseInfo; + +/// The reward earned by the user for interacting with a rewarded ad. Is nil until the ad has +/// successfully loaded. +@property(nonatomic, readonly, nullable) GADAdReward *reward; + +/// Options specified for server-to-server user reward verification. +@property(nonatomic, copy, nullable) + GADServerSideVerificationOptions *serverSideVerificationOptions; + +/// The loaded ad's metadata. Is nil if no ad is loaded or the loaded ad doesn't have metadata. Ad +/// metadata may update after loading. Use the rewardedAdMetadataDidChange: delegate method on +/// GADRewardedAdMetadataDelegate to listen for updates. +@property(nonatomic, readonly, nullable) NSDictionary *adMetadata; + +/// Delegate for ad metadata changes. +@property(nonatomic, weak, nullable) id adMetadataDelegate; + +/// Presents the rewarded ad with the provided view controller and rewarded delegate to call back on +/// various intermission events. The delegate is strongly retained by the receiver until a terminal +/// delegate method is called. Terminal methods are -rewardedAd:didFailToPresentWithError: and +/// -rewardedAdDidClose: of GADRewardedAdDelegate. +- (void)presentFromRootViewController:(nonnull UIViewController *)viewController + delegate:(nonnull id)delegate; + +#pragma mark Deprecated + +/// Deprecated. Use responseInfo.adNetworkClassName instead. +@property(nonatomic, readonly, copy, nullable) + NSString *adNetworkClassName GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use responseInfo.adNetworkClassName."); + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAdDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAdDelegate.h new file mode 100644 index 00000000..6ae0d823 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAdDelegate.h @@ -0,0 +1,36 @@ +// +// GADRewardedDelegate.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import + +@class GADRewardedAd; + +/// Delegate for receiving state change messages from a GADRewardedAd. +@protocol GADRewardedAdDelegate + +@required + +/// Tells the delegate that the user earned a reward. +- (void)rewardedAd:(nonnull GADRewardedAd *)rewardedAd + userDidEarnReward:(nonnull GADAdReward *)reward; + +@optional + +/// Tells the delegate that the rewarded ad failed to present. +- (void)rewardedAd:(nonnull GADRewardedAd *)rewardedAd + didFailToPresentWithError:(nonnull NSError *)error; + +/// Tells the delegate that the rewarded ad was presented. +- (void)rewardedAdDidPresent:(nonnull GADRewardedAd *)rewardedAd; + +/// Tells the delegate that the rewarded ad was dismissed. +- (void)rewardedAdDidDismiss:(nonnull GADRewardedAd *)rewardedAd; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAdMetadataDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAdMetadataDelegate.h new file mode 100644 index 00000000..0660d328 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADRewardedAdMetadataDelegate.h @@ -0,0 +1,24 @@ +// +// GADRewardedAdMetadataDelegate.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +#import +#import + +@class GADRewardedAd; + +/// Delegate for receiving metadata change messages from a GADRewardedAd. +@protocol GADRewardedAdMetadataDelegate + +@optional + +/// Tells the delegate that the rewarded ad's metadata changed. Called when an ad loads, and when a +/// loaded ad's metadata changes. +- (void)rewardedAdMetadataDidChange:(nonnull GADRewardedAd *)rewardedAd; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADSearchBannerView.h b/ios/platform/GoogleMobileAds.framework/Headers/GADSearchBannerView.h index 590b2770..2168679b 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADSearchBannerView.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADSearchBannerView.h @@ -2,14 +2,14 @@ // GADSearchBannerView.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // #import #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// A view that displays search ads. /// To show search ads: @@ -20,8 +20,8 @@ GAD_ASSUME_NONNULL_BEGIN /// If the banner view is initialized with kGADAdSizeFluid and the corresponding request is created /// with dynamic height parameters, this delegate will be called when the ad size changes. -@property(nonatomic, weak, GAD_NULLABLE) IBOutlet id adSizeDelegate; +@property(nonatomic, weak, nullable) IBOutlet id adSizeDelegate; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADSearchRequest.h b/ios/platform/GoogleMobileAds.framework/Headers/GADSearchRequest.h index 34fb68bd..eea0a80b 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADSearchRequest.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADSearchRequest.h @@ -2,16 +2,15 @@ // GADSearchRequest.h // Google Mobile Ads SDK // -// Copyright 2011 Google Inc. All rights reserved. +// Copyright 2011 Google LLC. All rights reserved. // #import -#import - #import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Search ad border types. typedef NS_ENUM(NSUInteger, GADSearchBorderType) { @@ -32,31 +31,31 @@ typedef NS_ENUM(NSUInteger, GADSearchCallButtonColor) { @interface GADSearchRequest : GADRequest /// The search ad query. -@property(nonatomic, copy, GAD_NULLABLE) NSString *query; +@property(nonatomic, copy, nullable) NSString *query; /// The search ad background color. -@property(nonatomic, readonly, copy, GAD_NULLABLE) UIColor *backgroundColor; +@property(nonatomic, readonly, copy, nullable) UIColor *backgroundColor; /// The search ad gradient "from" color. -@property(nonatomic, readonly, copy, GAD_NULLABLE) UIColor *gradientFrom; +@property(nonatomic, readonly, copy, nullable) UIColor *gradientFrom; /// The search ad gradient "to" color. -@property(nonatomic, readonly, copy, GAD_NULLABLE) UIColor *gradientTo; +@property(nonatomic, readonly, copy, nullable) UIColor *gradientTo; /// The search ad header color. -@property(nonatomic, copy, GAD_NULLABLE) UIColor *headerColor; +@property(nonatomic, copy, nullable) UIColor *headerColor; /// The search ad description text color. -@property(nonatomic, copy, GAD_NULLABLE) UIColor *descriptionTextColor; +@property(nonatomic, copy, nullable) UIColor *descriptionTextColor; /// The search ad anchor text color. -@property(nonatomic, copy, GAD_NULLABLE) UIColor *anchorTextColor; +@property(nonatomic, copy, nullable) UIColor *anchorTextColor; /// The search ad text font family. -@property(nonatomic, copy, GAD_NULLABLE) NSString *fontFamily; +@property(nonatomic, copy, nullable) NSString *fontFamily; /// The search ad header text size. @property(nonatomic, assign) NSUInteger headerTextSize; /// The search ad border color. -@property(nonatomic, copy, GAD_NULLABLE) UIColor *borderColor; +@property(nonatomic, copy, nullable) UIColor *borderColor; /// The search ad border type. @property(nonatomic, assign) GADSearchBorderType borderType; /// The search ad border thickness. @property(nonatomic, assign) NSUInteger borderThickness; /// The search ad custom channels. -@property(nonatomic, copy, GAD_NULLABLE) NSString *customChannels; +@property(nonatomic, copy, nullable) NSString *customChannels; /// The search ad call button color. @property(nonatomic, assign) GADSearchCallButtonColor callButtonColor; @@ -74,4 +73,4 @@ typedef NS_ENUM(NSUInteger, GADSearchCallButtonColor) { @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADServerSideVerificationOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADServerSideVerificationOptions.h new file mode 100644 index 00000000..8cb255b9 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADServerSideVerificationOptions.h @@ -0,0 +1,20 @@ +// +// GADServerSideVerificationOptions.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +/// Options for server-to-server verification callbacks for a rewarded ad. +@interface GADServerSideVerificationOptions : NSObject + +/// A unique identifier used to identify the user when making server-to-server reward callbacks. +/// This value will be passed as a parameter of the callback URL to the publisher's server. +@property(nonatomic, copy, nullable) NSString *userIdentifier; + +/// Optional custom reward string to include in the server-to-server callback. +@property(nonatomic, copy, nullable) NSString *customRewardString; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+ConfirmationClick.h b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+ConfirmationClick.h index 7513522b..eb23079d 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+ConfirmationClick.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+ConfirmationClick.h @@ -2,33 +2,28 @@ // GADUnifiedNativeAd+ConfirmationClick.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import #import -#import #import -#import - -GAD_ASSUME_NONNULL_BEGIN +#import -@interface GADUnifiedNativeAd (ConfirmationClick) +@interface GADUnifiedNativeAd (ConfirmedClick) /// Unconfirmed click delegate. -@property(nonatomic, weak, nullable) - id unconfirmedClickDelegate; +@property(nonatomic, weak, nullable) id + unconfirmedClickDelegate; /// Registers a view that will confirm the click. - (void)registerClickConfirmingView:(nullable UIView *)view; -/// Cancels the unconfirmed click. Called when user fails to confirm the click. When this method is -/// called, SDK stops tracking click on the registered click confirming view and invokes the -/// -nativeAdDidCancelUnconfirmedClick: delegate method. If there's no ongoing unconfirmed click, -/// this method is no-op. +/// Cancels the unconfirmed click. Call this method when the user fails to confirm the click. +/// Calling this method causes the SDK to stop tracking clicks on the registered click confirming +/// view and invokes the -nativeAdDidCancelUnconfirmedClick: delegate method. If no unconfirmed +/// click is in progress, this method has no effect. - (void)cancelUnconfirmedClick; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+CustomClickGesture.h b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+CustomClickGesture.h new file mode 100644 index 00000000..630a3f5e --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd+CustomClickGesture.h @@ -0,0 +1,22 @@ +// +// GADUnifiedNativeAd+CustomClickGesture.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +@interface GADUnifiedNativeAd (CustomClickGesture) + +/// Indicates whether the custom click gestures feature can be used. +@property(nonatomic, readonly, getter=isCustomClickGestureEnabled) BOOL customClickGestureEnabled; + +/// Enables custom click gestures. Must be called before the ad is associated with an ad view. +/// Available for whitelisted accounts only. +- (void)enableCustomClickGestures; + +/// Records a click triggered by a custom click gesture. +- (void)recordCustomClickGesture; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd.h b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd.h index f0ce2cbf..b56ef990 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAd.h @@ -2,22 +2,24 @@ // GADUnifiedNativeAd.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import -#import - #import #import +#import #import +#import #import -#import +#import #import #import +#import #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Unified native ad. To request this ad type, pass kGADAdLoaderAdTypeUnifiedNative /// (see GADAdLoaderAdTypes.h) to the |adTypes| parameter in GADAdLoader's initializer method. If @@ -48,22 +50,31 @@ GAD_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly, copy, nullable) NSString *price; /// Identifies the advertiser. For example, the advertiser’s name or visible URL. @property(nonatomic, readonly, copy, nullable) NSString *advertiser; -/// Video controller for controlling video playback in GADUnifiedNativeAdView's mediaView. -@property(nonatomic, strong, readonly, nullable) GADVideoController *videoController; /// Optional delegate to receive state change notifications. @property(nonatomic, weak, nullable) id delegate; -/// Root view controller for handling ad actions. +/// Reference to a root view controller that is used by the ad to present full screen content after +/// the user interacts with the ad. The root view controller is most commonly the view controller +/// displaying the ad. @property(nonatomic, weak, nullable) UIViewController *rootViewController; /// Dictionary of assets which aren't processed by the receiver. @property(nonatomic, readonly, copy, nullable) NSDictionary *extraAssets; -/// The ad network class name that fetched the current ad. For both standard and mediated Google -/// AdMob ads, this method returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation -/// custom events, this method returns @"GADMAdapterCustomEvents". -@property(nonatomic, readonly, copy, nullable) NSString *adNetworkClassName; +/// Information about the ad response that returned the ad. +@property(nonatomic, readonly, nonnull) GADResponseInfo *responseInfo; + +/// Indicates whether custom Mute This Ad is available for the native ad. +@property(nonatomic, readonly, getter=isCustomMuteThisAdAvailable) BOOL customMuteThisAdAvailable; + +/// An array of Mute This Ad reasons used to render customized mute ad survey. Use this array to +/// implement your own Mute This Ad feature only when customMuteThisAdAvailable is YES. +@property(nonatomic, readonly, nullable) NSArray *muteThisAdReasons; + +/// Media content. Set the associated media view's mediaContent property to this object to display +/// this content. +@property(nonatomic, readonly, nonnull) GADMediaContent *mediaContent; /// Registers ad view, clickable asset views, and nonclickable asset views with this native ad. /// Media view shouldn't be registered as clickable. @@ -80,12 +91,30 @@ GAD_ASSUME_NONNULL_BEGIN /// unregistered. - (void)unregisterAdView; +/// Reports the mute event with the mute reason selected by user. Use nil if no reason was selected. +/// Call this method only if customMuteThisAdAvailable is YES. +- (void)muteThisAdWithReason:(nullable GADMuteThisAdReason *)reason; + +#pragma mark - Deprecated + +/// Video controller for controlling video playback in GADUnifiedNativeAdView's mediaView. +@property(nonatomic, readonly, nullable) + GADVideoController *videoController GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use the videoController property from the ad's mediaContent instead."); + +/// The ad network class name that fetched the current ad. For both standard and mediated Google +/// AdMob ads, this method returns @"GADMAdapterGoogleAdMobAds". For ads fetched via mediation +/// custom events, this method returns @"GADMAdapterCustomEvents". +@property(nonatomic, readonly, copy, nullable) + NSString *adNetworkClassName GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use responseInfo.adNetworkClassName."); + @end #pragma mark - Protocol and constants /// The delegate of a GADAdLoader object implements this protocol to receive GADUnifiedNativeAd ads. -@protocol GADUnifiedNativeAdLoaderDelegate +@protocol GADUnifiedNativeAdLoaderDelegate /// Called when a unified native ad is received. - (void)adLoader:(GADAdLoader *)adLoader didReceiveUnifiedNativeAd:(GADUnifiedNativeAd *)nativeAd; @end @@ -120,10 +149,10 @@ GAD_ASSUME_NONNULL_BEGIN /// Weak reference to your ad view's media asset view. @property(nonatomic, weak, nullable) IBOutlet GADMediaView *mediaView; /// Weak reference to your ad view's AdChoices view. Must set adChoicesView before setting -/// nativeAd, otherwise AdChoices will be rendered in the publisher's preferredAdChoicesPosition as +/// nativeAd, otherwise AdChoices will be rendered according to the preferredAdChoicesPosition /// defined in GADNativeAdViewAdOptions. @property(nonatomic, weak, nullable) IBOutlet GADAdChoicesView *adChoicesView; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdAssetIdentifiers.h b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdAssetIdentifiers.h index cbe687d9..940262dd 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdAssetIdentifiers.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdAssetIdentifiers.h @@ -2,16 +2,15 @@ // GADUnifiedNativeAdAssetIdentifiers.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import - #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN -typedef NSString *GADUnifiedNativeAssetIdentifier GAD_STRING_ENUM; +typedef NSString *GADUnifiedNativeAssetIdentifier NS_STRING_ENUM; GAD_EXTERN GADUnifiedNativeAssetIdentifier const GADUnifiedNativeHeadlineAsset; GAD_EXTERN GADUnifiedNativeAssetIdentifier const GADUnifiedNativeCallToActionAsset; @@ -25,4 +24,4 @@ GAD_EXTERN GADUnifiedNativeAssetIdentifier const GADUnifiedNativeAdvertiserAsset GAD_EXTERN GADUnifiedNativeAssetIdentifier const GADUnifiedNativeMediaViewAsset; GAD_EXTERN GADUnifiedNativeAssetIdentifier const GADUnifiedNativeAdChoicesViewAsset; -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdDelegate.h index e27294bf..8cebd360 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdDelegate.h @@ -2,23 +2,22 @@ // GADUnifiedNativeAdDelegate.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import - #import @class GADUnifiedNativeAd; -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Identifies native ad assets. -@protocol GADUnifiedNativeAdDelegate +@protocol GADUnifiedNativeAdDelegate @optional -#pragma mark Ad Lifecycle Events +#pragma mark - Ad Lifecycle Events /// Called when an impression is recorded for an ad. Only called for Google ads and is not supported /// for mediated ads. @@ -28,7 +27,7 @@ GAD_ASSUME_NONNULL_BEGIN /// mediated ads. - (void)nativeAdDidRecordClick:(GADUnifiedNativeAd *)nativeAd; -#pragma mark Click-Time Lifecycle Notifications +#pragma mark - Click-Time Lifecycle Notifications /// Called before presenting the user a full screen view in response to an ad action. Use this /// opportunity to stop animations, time sensitive interactions, etc. @@ -52,6 +51,12 @@ GAD_ASSUME_NONNULL_BEGIN /// methods, like applicationDidEnterBackground:, will be called immediately before this. - (void)nativeAdWillLeaveApplication:(GADUnifiedNativeAd *)nativeAd; +#pragma mark - Mute This Ad + +/// Used for Mute This Ad feature. Called after the native ad is muted. Only called for Google ads +/// and is not supported for mediated ads. +- (void)nativeAdIsMuted:(nonnull GADUnifiedNativeAd *)nativeAd; + @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdUnconfirmedClickDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdUnconfirmedClickDelegate.h index 90a74987..eb26c0c1 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdUnconfirmedClickDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADUnifiedNativeAdUnconfirmedClickDelegate.h @@ -2,7 +2,7 @@ // GADUnifiedNativeAdUnconfirmedClickDelegate.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import @@ -12,23 +12,20 @@ @class GADUnifiedNativeAd; -GAD_ASSUME_NONNULL_BEGIN - -@protocol GADUnifiedNativeAdUnconfirmedClickDelegate +/// Delegate methods for handling unified native ad unconfirmed clicks. +@protocol GADUnifiedNativeAdUnconfirmedClickDelegate /// Tells the delegate that native ad receives an unconfirmed click on view with asset ID. You /// should update user interface and ask user to confirm the click once this message is received. -/// Use the -registerClickConfirmingView: method in GADNUnifiedNativeAd+ConfirmationClick.h to -/// register a view that will confirm the click. Only called for Google ads and is not supported for -/// mediated ads. -- (void)nativeAd:(GADUnifiedNativeAd *)nativeAd - didReceiveUnconfirmedClickOnAssetID:(GADUnifiedNativeAssetIdentifier)assetID; +/// Use the -registerClickConfirmingView: method in GADUnifiedNativeAd+ConfirmedClick.h to register +/// a view that will confirm the click. Only called for Google ads and is not supported for mediated +/// ads. +- (void)nativeAd:(nonnull GADUnifiedNativeAd *)nativeAd + didReceiveUnconfirmedClickOnAssetID:(nonnull GADUnifiedNativeAssetIdentifier)assetID; /// Tells the delegate that the unconfirmed click is cancelled. You should revert the user interface /// change once this message is received. Only called for Google ads and is not supported for /// mediated ads. -- (void)nativeAdDidCancelUnconfirmedClick:(GADUnifiedNativeAd *)nativeAd; +- (void)nativeAdDidCancelUnconfirmedClick:(nonnull GADUnifiedNativeAd *)nativeAd; @end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADVideoController.h b/ios/platform/GoogleMobileAds.framework/Headers/GADVideoController.h index fa4fc9da..04e052ef 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADVideoController.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADVideoController.h @@ -2,15 +2,14 @@ // GADVideoController.h // Google Mobile Ads SDK // -// Copyright (c) 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import -#import - #import +#import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADVideoControllerDelegate; @@ -21,7 +20,7 @@ GAD_ASSUME_NONNULL_BEGIN @interface GADVideoController : NSObject /// Delegate for receiving video notifications. -@property(nonatomic, weak, GAD_NULLABLE) id delegate; +@property(nonatomic, weak, nullable) id delegate; /// Mute or unmute video. Set to YES to mute the video. Set to NO to allow the video to play sound. - (void)setMute:(BOOL)mute; @@ -32,17 +31,26 @@ GAD_ASSUME_NONNULL_BEGIN /// Pause the video. Doesn't do anything if the video is already paused. - (void)pause; -/// Returns a Boolean indicating if the receiver has video content. -- (BOOL)hasVideoContent; - -/// Returns the video's aspect ratio (width/height) or 0 if no video is present. -- (double)aspectRatio; +/// Stops the video and displays the video's first frame. Call -play to resume playback at the start +/// of the video. Contact your account manager to enable this feature. +- (void)stop; -/// Indicates if video custom controls (i.e. play/pause/mute/unmute) are enabled. +/// Indicates whether video custom controls (i.e. play/pause/mute/unmute) are enabled. - (BOOL)customControlsEnabled; -/// Indicates if video click to expand behavior is enabled. +/// Indicates whether video click to expand behavior is enabled. - (BOOL)clickToExpandEnabled; + +#pragma mark - Deprecated + +/// Returns a Boolean indicating if the receiver has video content. +- (BOOL)hasVideoContent GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use the hasVideoContent property from GADUnifiedNativeAd's mediaContent instead."); + +/// Returns the video's aspect ratio (width/height) or 0 if no video is present. +- (double)aspectRatio GAD_DEPRECATED_MSG_ATTRIBUTE( + "Use the aspectRatio property from GADUnifiedNativeAd's mediaContent instead."); + @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADVideoControllerDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/GADVideoControllerDelegate.h index 4b6fff9c..318473d0 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADVideoControllerDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADVideoControllerDelegate.h @@ -2,18 +2,18 @@ // GADVideoControllerDelegate.h // Google Mobile Ads SDK // -// Copyright (c) 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// The GADVideoControllerDelegate protocol defines methods that are called by the video controller -/// object in response to the video events that occured throught the lifetime of the video rendered -/// by an ad. -@protocol GADVideoControllerDelegate +/// object in response to the video events that occurred throughout the lifetime of the video +/// rendered by an ad. +@protocol GADVideoControllerDelegate @optional @@ -34,4 +34,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GADVideoOptions.h b/ios/platform/GoogleMobileAds.framework/Headers/GADVideoOptions.h index 26bb7ca4..531ad048 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GADVideoOptions.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GADVideoOptions.h @@ -2,21 +2,22 @@ // GADVideoOptions.h // Google Mobile Ads SDK // -// Copyright 2016 Google Inc. All rights reserved. +// Copyright 2016 Google LLC. All rights reserved. // #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Video ad options. @interface GADVideoOptions : GADAdLoaderOptions -/// Indicates if videos should start muted. By default this property value is YES. +/// Indicates whether videos should start muted. By default this property value is YES. @property(nonatomic, assign) BOOL startMuted; -/// Indicates if the requested video should have custom controls enabled for play/pause/mute/unmute. +/// Indicates whether the requested video should have custom controls enabled for +/// play/pause/mute/unmute. @property(nonatomic, assign) BOOL customControlsRequested; /// Indicates whether the requested video should have the click to expand behavior. @@ -24,4 +25,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAds.h b/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAds.h index 4096d38e..f087be46 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAds.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAds.h @@ -2,45 +2,47 @@ // GoogleMobileAds.h // Google Mobile Ads SDK // -// Copyright 2014 Google Inc. All rights reserved. +// Copyright 2014 Google LLC. All rights reserved. #import #import -#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0 -#error The Google Mobile Ads SDK requires a deployment target of iOS 6.0 or later. -#endif - -#if defined(__ARM_ARCH_7S__) && __ARM_ARCH_7S__ -#error The Google Mobile Ads SDK doesn't support linking with armv7s. Remove armv7s from "ARCHS" (Architectures) in your Build Settings. -#endif - /// Project version string for GoogleMobileAds. FOUNDATION_EXPORT const unsigned char GoogleMobileAdsVersionString[]; // Header files. #import +#import + +#import +#import #import #import -#import +#import #import +#import #import #import -#import -#import #import +#import #import #import #import +#import +#import +#import #import #import +#import +#import #import -#import #import #import #import +#import #import +#import #import #import #import @@ -64,20 +66,21 @@ FOUNDATION_EXPORT const unsigned char GoogleMobileAdsVersionString[]; #import #import #import -#import -#import -#import -#import #import #import #import +#import #import #import #import +#import #import +#import #import +#import #import +#import #import #import @@ -96,17 +99,34 @@ FOUNDATION_EXPORT const unsigned char GoogleMobileAdsVersionString[]; #import #import #import +#import +#import +#import +#import #import #import #import #import #import -#import -#import #import #import +#import +#import +#import +#import #import +#import +#import +#import +#import +#import +#import #import #import #import +#import + + +#import +#import diff --git a/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAdsDefines.h b/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAdsDefines.h index 4ba6e6e0..9fa90971 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAdsDefines.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/GoogleMobileAdsDefines.h @@ -2,7 +2,7 @@ // GoogleMobileAdsDefines.h // Google Mobile Ads SDK // -// Copyright (c) 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import @@ -13,7 +13,14 @@ #define GAD_EXTERN extern __attribute__((visibility("default"))) #endif // defined(__cplusplus) -#if defined(__has_feature) && defined(__has_attribute) +#if !defined(__has_feature) +#error "Use latest Xcode version." +#endif // !defined(__has_feature) + +#if !defined(__has_attribute) +#error "Use latest Xcode version." +#endif // !defined(__has_attribute) + #if __has_feature(attribute_deprecated_with_message) #define GAD_DEPRECATED_MSG_ATTRIBUTE(s) __attribute__((deprecated(s))) #elif __has_attribute(deprecated) @@ -21,42 +28,29 @@ #else #define GAD_DEPRECATED_MSG_ATTRIBUTE(s) #endif // __has_feature(attribute_deprecated_with_message) + #if __has_attribute(deprecated) #define GAD_DEPRECATED_ATTRIBUTE __attribute__((deprecated)) #else #define GAD_DEPRECATED_ATTRIBUTE #endif // __has_attribute(deprecated) -#else -#define GAD_DEPRECATED_ATTRIBUTE -#define GAD_DEPRECATED_MSG_ATTRIBUTE(s) -#endif // defined(__has_feature) && defined(__has_attribute) - -#ifndef IBInspectable -#define IBInspectable -#endif #if __has_feature(nullability) // Available starting in Xcode 6.3. #define GAD_NULLABLE_TYPE __nullable #define GAD_NONNULL_TYPE __nonnull #define GAD_NULLABLE nullable -#define GAD_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN -#define GAD_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END #else -#define GAD_NULLABLE_TYPE -#define GAD_NONNULL_TYPE -#define GAD_NULLABLE -#define GAD_ASSUME_NONNULL_BEGIN -#define GAD_ASSUME_NONNULL_END +#error "Use latest Xcode version." #endif // __has_feature(nullability) #if __has_attribute(objc_boxable) // Available starting in Xcode 7.3. #define GAD_BOXABLE __attribute__((objc_boxable)) #else -#define GAD_BOXABLE +#error "Use latest Xcode version." #endif // __has_attribute(objc_boxable) #if defined(NS_STRING_ENUM) // Available starting in Xcode 8.0. #define GAD_STRING_ENUM NS_STRING_ENUM #else -#define GAD_STRING_ENUM +#error "Use latest Xcode version." #endif diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkAdapterProtocol.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkAdapterProtocol.h index a420efcb..c544b518 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkAdapterProtocol.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkAdapterProtocol.h @@ -16,85 +16,80 @@ @protocol GADMAdNetworkConnector; /// Ad network adapter protocol. -@protocol GADMAdNetworkAdapter +@protocol GADMAdNetworkAdapter /// Returns a version string for the adapter. It can be any string that uniquely identifies the -/// version of your adapter. For example, "1.0", or simply a date such as "20110915". +/// adapter's version. For example, "1.0", or a date such as "20110915". + (NSString *)adapterVersion; -/// The extras class that is used to specify additional parameters for a request to this ad network. -/// Returns Nil if the network does not have extra settings for publishers to send. +/// Returns the extras class that is used by publishers to provide additional parameters to this +/// adapter. Returns Nil if the adapter doesn't have extra publisher provided settings. + (Class)networkExtrasClass; -/// Designated initializer. Implementing classes can and should keep the connector in an instance -/// variable. However you must never retain the connector, as doing so will create a circular -/// reference and cause memory leaks. +/// Designated initializer. Adapters can and should store a weak reference to the connector. +/// However, adapters must not keep a strong reference to the connector, as doing so creates a +/// reference cycle and abandoned memory. - (instancetype)initWithGADMAdNetworkConnector:(id)connector; -/// Asks the adapter to initiate a banner ad request. The adapter does not need to return anything. -/// The assumption is that the adapter will start an asynchronous ad fetch over the network. Your -/// adapter may act as a delegate to your SDK to listen to callbacks. If your SDK does not support -/// the given ad size, or does not support banner ads, call back to the adapter:didFailAd: method of -/// the connector. +/// Asks the adapter to initiate an asynchronous banner ad request. The adapter may act as a +/// delegate to your SDK to listen to callbacks. If your SDK doesn't support the given ad size, or +/// doesn't support banner ads, call adapter:didFailAd: on the connector. - (void)getBannerWithSize:(GADAdSize)adSize; -/// Asks the adapter to initiate an interstitial ad request. The adapter does not need to return -/// anything. The assumption is that the adapter will start an asynchronous ad fetch over the -/// network. Your adapter may act as a delegate to your SDK to listen to callbacks. If your SDK does -/// not support interstitials, call back to the adapter:didFailInterstitial: method of the -/// connector. +/// Asks the adapter to initiate an asynchronous interstitial ad request. The adapter may act as a +/// delegate to your SDK to listen to callbacks. If your SDK doesn't support interstitials, call +/// adapter:didFailInterstitial: on the connector. - (void)getInterstitial; -/// When called, the adapter must remove itself as a delegate or notification observer from the -/// underlying ad network SDK. You should also call this method in your adapter dealloc, so when -/// your adapter goes away, your SDK will not call a freed object. This function should be -/// idempotent and should not crash regardless of when or how many times the method is called. +/// When called, the adapter must remove strong references to itself (e.g., delegate properties and +/// notification observers). You should also call this method in your adapter dealloc to prevent +/// your SDK from interacting with the deallocated adapter. This function may be called multiple +/// times. - (void)stopBeingDelegate; -/// Present an interstitial using the supplied UIViewController, by calling +/// Presents an interstitial using the supplied UIViewController, by calling /// presentViewController:animated:completion:. /// /// Your interstitial should not immediately present itself when it is received. Instead, you should /// wait until this method is called on your adapter to present the interstitial. /// -/// Make sure to call adapterWillPresentInterstitial: on the connector when the interstitial is +/// The adapter must call adapterWillPresentInterstitial: on the connector when the interstitial is /// about to be presented, and adapterWillDismissInterstitial: and adapterDidDismissInterstitial: /// when the interstitial is being dismissed. - (void)presentInterstitialFromRootViewController:(UIViewController *)rootViewController; @optional -/// Starts request for a native ad. |adTypes| contains the list of native ad types requested. See -/// GADAdLoaderAdTypes.h for available ad types. |options| are any additional options configured by -/// the publisher for requesting a native ad. See GADNativeAdImageAdLoaderOptions.h for available -/// image options. When this method is called the receiver may start native ad request -/// asynchronously. On completion the receiver should notify the Google Mobile Ads SDK with a native -/// ad object using the receiver's connector method -/// adapter:didReceiveNativeAdDataSource:mediationDelegate or adapter:didFailAd: if the ad request -/// encountered an error. -- (void)getNativeAdWithAdTypes:(NSArray *)adTypes options:(NSArray *)options; - -/// Indicates if the adapter handles user clicks. If this method returns YES, the adapter must -/// handle user clicks and notify the Google Mobile Ads SDK of clicks using -/// +[GADMediatedNativeAdNotificationSource mediatedNativeAdDidRecordClick:]. If this method returns +/// Asks the adapter to initiate an asynchronous native ad request. |adTypes| contains the list of +/// native ad types requested. See GADAdLoaderAdTypes.h for available ad types. |options| contains +/// additional options configured by the publisher. See GADNativeAdImageAdLoaderOptions.h for +/// available image options. +/// +/// On ad load success or failure, call adapter:didReceiveNativeAdDataSource:mediationDelegate or +/// adapter:didFailAd: on the connector. +- (void)getNativeAdWithAdTypes:(NSArray *)adTypes + options:(NSArray *)options; + +/// Indicates if the adapter handles user clicks. If the adapter returns YES, it must handle user +/// clicks and notify the Google Mobile Ads SDK of clicks using +/// +[GADMediatedNativeAdNotificationSource mediatedNativeAdDidRecordClick:]. If the adapter returns /// NO, the Google Mobile Ads SDK handles user clicks and notifies the adapter of clicks using /// -[GADMediatedNativeAdDelegate /// mediatedNativeAd:didRecordClickOnAssetWithName:view:viewController:]. - (BOOL)handlesUserClicks; -/// Indicates if the adapter handles user impressions tracking. If this method returns YES, the +/// Indicates if the adapter handles user impressions tracking. If the adapter returns YES, the /// Google Mobile Ads SDK will not track user impressions and the adapter must notify the /// Google Mobile Ads SDK of impressions using +[GADMediatedNativeAdNotificationSource -/// mediatedNativeAdDidRecordImpression:]. If this method returns NO, -/// the Google Mobile Ads SDK tracks user impressions and notifies the adapter of impressions -/// using -[GADMediatedNativeAdDelegate mediatedNativeAdDidRecordImpression:]. +/// mediatedNativeAdDidRecordImpression:]. If the adapter returns NO, the Google Mobile Ads SDK +/// tracks user impressions and notifies the adapter of impressions using +/// -[GADMediatedNativeAdDelegate mediatedNativeAdDidRecordImpression:]. - (BOOL)handlesUserImpressions; -/// If your ad network handles multiple ad sizes for the same banner ad, implement this method to -/// know when the user changes the banner size. This is typically changing from -/// kGADAdSizeSmartBannerPortrait to kGADAdSizeSmartBannerLandscape, or vice versa. If this method -/// is not implemented, every time the user changes the ad size, a new ad will be requested with the -/// new size by calling your getBannerWithSize: method. +/// If your ad network handles multiple ad sizes for the same banner ad, implement this method to be +/// informed of banner size updates. Ad sizes typically change between kGADAdSizeSmartBannerPortrait +/// and kGADAdSizeSmartBannerLandscape. If this method is not implemented, the ad is removed from +/// the user interface when the size changes. - (void)changeAdSizeTo:(GADAdSize)adSize; @end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkConnectorProtocol.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkConnectorProtocol.h index a020edf3..85bfaee9 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkConnectorProtocol.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMAdNetworkConnectorProtocol.h @@ -16,12 +16,12 @@ /// GADMAdNetworkConnector protocol. The connector object can be used to obtain necessary /// information for ad requests, and to call back to the mediation SDK on ad request returns and /// user interactions. -@protocol GADMAdNetworkConnector +@protocol GADMAdNetworkConnector /// When you need to show a landing page or any other modal view, such as when a user clicks or when /// your Ads SDK needs to show an interstitial, use this method to obtain a UIViewController that /// you can use to show your modal view. Call the -presentViewController:animated:completion: method -/// of the returned UIViewController . +/// of the returned UIViewController. - (UIViewController *)viewControllerForPresentingModalView; /// Returns the preferred ad volume as a fraction of system volume (0.0 to 1.0). diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h index 6eb05f1c..2491eb4f 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h @@ -10,7 +10,7 @@ @protocol GADMRewardBasedVideoAdNetworkConnector; /// Your adapter must conform to this protocol to provide reward based video ads. -@protocol GADMRewardBasedVideoAdNetworkAdapter +@protocol GADMRewardBasedVideoAdNetworkAdapter /// Returns a version string for the adapter. It can be any string that uniquely identifies the /// version of your adapter. For example, "1.0", or simply a date such as "20110915". @@ -23,7 +23,7 @@ /// Returns an initialized instance of the adapter when mediation ad requests come in. The adapter /// must only maintain a weak reference to the provided connector. - (instancetype)initWithRewardBasedVideoAdNetworkConnector: - (id)connector; + (id)connector; /// Tells the adapter to set up reward based video ads. The adapter should notify the Google Mobile /// Ads SDK whether set up has succeeded or failed using callbacks provided in the connector. When diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h index d23ec4e0..f717d6e0 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h @@ -1,24 +1,24 @@ // -// GADMRewardBasedVideoAdNetworkConnector.h +// GADMRewardBasedVideoAdNetworkConnectorProtocol.h // Google Mobile Ads SDK // // Copyright 2015 Google. All rights reserved. // -#import +#import +#import -@protocol GADMediationAdRequest; @protocol GADMRewardBasedVideoAdNetworkAdapter; /// Reward based video ad network adapters interact with the mediation SDK using an object that /// conforms to the GADMRewardBasedVideoAdNetworkConnector protocol. The connector object can be /// used to obtain information for ad requests and to call back to the mediation SDK on ad responses /// and user interactions. -@protocol GADMRewardBasedVideoAdNetworkConnector +@protocol GADMRewardBasedVideoAdNetworkConnector /// Tells the delegate that the adapter successfully set up a reward based video ad. - (void)adapterDidSetUpRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that the adapter failed to set up a reward based video ad. - (void)adapter:(id)rewardBasedVideoAdAdapter @@ -29,23 +29,23 @@ /// Tells the delegate that a reward based video ad has loaded. - (void)adapterDidReceiveRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that a reward based video ad has opened. - (void)adapterDidOpenRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that a reward based video ad has started playing. - (void)adapterDidStartPlayingRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that a reward based video ad has completed playing. - (void)adapterDidCompletePlayingRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that a reward based video ad has closed. - (void)adapterDidCloseRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that the adapter has rewarded the user. - (void)adapter:(id)rewardBasedVideoAd @@ -53,7 +53,7 @@ /// Tells the delegate that a reward based video ad's action will leave the application. - (void)adapterWillLeaveApplication: - (id)rewardBasedVideoAdAdapter; + (id)rewardBasedVideoAdAdapter; /// Tells the delegate that a reward based video ad failed to load. - (void)adapter:(id)rewardBasedVideoAdAdapter diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAd.h index aa070ce0..c82b00f2 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAd.h @@ -2,26 +2,25 @@ // GADMediatedNativeAd.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import -#import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Base protocol for mediated native ads. -@protocol GADMediatedNativeAd +@protocol GADMediatedNativeAd /// Returns a delegate object that receives state change notifications. - (nullable id)mediatedNativeAdDelegate; /// Returns a dictionary of asset names and object pairs for assets that are not handled by /// properties of the GADMediatedNativeAd subclass. -- (NSDictionary *GAD_NULLABLE_TYPE)extraAssets; +- (nullable NSDictionary *)extraAssets; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdDelegate.h index f5b4391d..b7d15e99 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdDelegate.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdDelegate.h @@ -2,7 +2,7 @@ // GADMediatedNativeAdDelegate.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import @@ -10,17 +10,18 @@ #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @protocol GADMediatedNativeAd; /// GADMediatedNativeAdDelegate objects handle mediated native ad events. -@protocol GADMediatedNativeAdDelegate +@protocol GADMediatedNativeAdDelegate @optional /// Tells the delegate that the mediated native ad has rendered in |view| with clickable asset views -/// and nonclickable asset views. viewController should be used to present modal views for the ad. +/// and nonclickable asset views. viewController should be used to present modal views if the ad +/// opens full screen. - (void)mediatedNativeAd:(id)mediatedNativeAd didRenderInView:(UIView *)view clickableAssetViews:(NSDictionary *)clickableAssetViews @@ -50,11 +51,11 @@ GAD_ASSUME_NONNULL_BEGIN /// used to present modal views for the ad. - (void)mediatedNativeAd:(id)mediatedNativeAd didRenderInView:(UIView *)view - viewController:(UIViewController *)viewController GAD_DEPRECATED_MSG_ATTRIBUTE( - "Use " - "-mediatedNativeAd:didRenderInView:clickableAssetViews:" - "nonclickableAssetViews:viewController instead."); + viewController:(UIViewController *)viewController + GAD_DEPRECATED_MSG_ATTRIBUTE("Use " + "-mediatedNativeAd:didRenderInView:clickableAssetViews:" + "nonclickableAssetViews:viewController: instead."); @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdNotificationSource.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdNotificationSource.h index a2a1725a..48002939 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdNotificationSource.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAdNotificationSource.h @@ -2,18 +2,19 @@ // GADMediatedNativeAdNotificationSource.h // Google Mobile Ads SDK // -// Copyright 2015 Google Inc. All rights reserved. +// Copyright 2015 Google LLC. All rights reserved. // #import - #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN -/// Used by mediation adapters to notify the Google Mobile Ads SDK about events occurring in the -/// lifecycle of a GADMediatedNativeAd. +/// Notifies the Google Mobile Ads SDK about the events performed by adapters. Adapters may perform +/// some action (e.g. opening an in app browser or opening the iTunes store) when handling callbacks +/// from GADMediatedNativeAdDelegate. Adapters in such case should notify the Google Mobile Ads SDK +/// by calling the relevant methods from this class. @interface GADMediatedNativeAdNotificationSource : NSObject /// Called by the adapter when it has registered an impression on the tracked view. Adapter should @@ -27,16 +28,15 @@ GAD_ASSUME_NONNULL_BEGIN /// Must be called by the adapter just before mediatedNativeAd has opened an in-app modal screen. + (void)mediatedNativeAdWillPresentScreen:(id)mediatedNativeAd; -/// Must be called by the adapter just before the in app modal screen opened by mediatedNativeAd is +/// Must be called by the adapter just before the in-app modal screen opened by mediatedNativeAd is /// dismissed. + (void)mediatedNativeAdWillDismissScreen:(id)mediatedNativeAd; -/// Must be called by the adapter after the in app modal screen opened by mediatedNativeAd is +/// Must be called by the adapter after the in-app modal screen opened by mediatedNativeAd is /// dismissed. + (void)mediatedNativeAdDidDismissScreen:(id)mediatedNativeAd; -/// Must be called by the adapter just before mediatedNativeAd causes another app (such as a browser -/// or the App Store) to take input focus. +/// Must be called by the adapter just before mediatedNativeAd leaves the application. + (void)mediatedNativeAdWillLeaveApplication:(id)mediatedNativeAd; #pragma mark - Mediated Native Video Ad Notifications @@ -52,4 +52,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAppInstallAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAppInstallAd.h deleted file mode 100644 index 4e9df1ab..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeAppInstallAd.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// GADMediatedNativeAppInstallAd.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google Inc. All rights reserved. -// - -#import - -#import -#import -#import - -GAD_ASSUME_NONNULL_BEGIN - -/// Provides methods used for constructing native app install ads. The adapter must return an object -/// conforming to this protocol for native app install requests. -@protocol GADMediatedNativeAppInstallAd - -/// App title. -- (NSString *GAD_NULLABLE_TYPE)headline; - -/// Array of GADNativeAdImage objects related to the advertised application. -- (NSArray *GAD_NULLABLE_TYPE)images; - -/// App description. -- (NSString *GAD_NULLABLE_TYPE)body; - -/// Application icon. -- (GADNativeAdImage *GAD_NULLABLE_TYPE)icon; - -/// Text that encourages user to take some action with the ad. For example "Install". -- (NSString *GAD_NULLABLE_TYPE)callToAction; - -/// App store rating (0 to 5). -- (NSDecimalNumber *GAD_NULLABLE_TYPE)starRating; - -/// The app store name. For example, "App Store". -- (NSString *GAD_NULLABLE_TYPE)store; - -/// String representation of the app's price. -- (NSString *GAD_NULLABLE_TYPE)price; - -@optional - -/// AdChoices view. -- (UIView *GAD_NULLABLE_TYPE)adChoicesView; - -/// Media view. -- (UIView *GAD_NULLABLE_TYPE)mediaView; - -/// Returns YES if the ad has video content. -- (BOOL)hasVideoContent; - -@end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeContentAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeContentAd.h deleted file mode 100644 index bd15dbdb..00000000 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedNativeContentAd.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// GADMediatedNativeContentAd.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google Inc. All rights reserved. -// - -#import - -#import -#import -#import - -GAD_ASSUME_NONNULL_BEGIN - -/// Provides methods used for constructing native content ads. -@protocol GADMediatedNativeContentAd - -/// Primary text headline. -- (NSString *GAD_NULLABLE_TYPE)headline; - -/// Secondary text. -- (NSString *GAD_NULLABLE_TYPE)body; - -/// List of large images. Each object is an instance of GADNativeAdImage. -- (NSArray *GAD_NULLABLE_TYPE)images; - -/// Small logo image. -- (GADNativeAdImage *GAD_NULLABLE_TYPE)logo; - -/// Text that encourages user to take some action with the ad. -- (NSString *GAD_NULLABLE_TYPE)callToAction; - -/// Identifies the advertiser. For example, the advertiser’s name or visible URL. -- (NSString *GAD_NULLABLE_TYPE)advertiser; - -@optional - -/// AdChoices view. -- (UIView *GAD_NULLABLE_TYPE)adChoicesView; - -/// Media view. -- (UIView *GAD_NULLABLE_TYPE)mediaView; - -/// Returns YES if the ad has video content. -- (BOOL)hasVideoContent; - -@end - -GAD_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAd.h index aa8645d1..cae1b26d 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAd.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAd.h @@ -2,20 +2,19 @@ // GADMediatedUnifiedNativeAd.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import - #import #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /// Provides methods used for constructing native ads. The adapter must return an object conforming /// to this protocol for native ad requests. -@protocol GADMediatedUnifiedNativeAd +@protocol GADMediatedUnifiedNativeAd /// Headline. @property(nonatomic, readonly, copy, nullable) NSString *headline; @@ -57,7 +56,10 @@ GAD_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly, nullable) UIView *mediaView; /// Indicates whether the ad has video content. -@property(nonatomic, assign, readonly) BOOL hasVideoContent; +@property(nonatomic, readonly) BOOL hasVideoContent; + +/// Media content aspect ratio (width/height) or 0 if there's no media content. +@property(nonatomic, readonly) CGFloat mediaContentAspectRatio; /// Tells the receiver that it has been rendered in |view| with clickable asset views and /// nonclickable asset views. viewController should be used to present modal views for the ad. @@ -79,12 +81,12 @@ GAD_ASSUME_NONNULL_BEGIN view:(UIView *)view viewController:(UIViewController *)viewController; -/// Tells the receiver that it has untracked |view|. This method is called when the mediatedNativeAd -/// is no longer rendered in the provided view and the delegate should stop tracking the view's +/// Tells the receiver that it has untracked |view|. This method is called when the mediated native +/// ad is no longer rendered in the provided view and the delegate should stop tracking the view's /// impressions and clicks. The method may also be called with a nil view when the view in which the /// mediated native ad has rendered is deallocated. - (void)didUntrackView:(nullable UIView *)view; @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAdNotificationSource.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAdNotificationSource.h index d21d9568..03103f13 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAdNotificationSource.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediatedUnifiedNativeAdNotificationSource.h @@ -2,18 +2,19 @@ // GADMediatedUnifiedNativeAdNotificationSource.h // Google Mobile Ads SDK // -// Copyright 2017 Google Inc. All rights reserved. +// Copyright 2017 Google LLC. All rights reserved. // #import - #import #import -GAD_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN -/// Used by mediation adapters to notify the Google Mobile Ads SDK about events occurring in the -/// lifecycle of a GADMediatedUnifiedNativeAd. +/// Notifies the Google Mobile Ads SDK about the events performed by adapters. Adapters may perform +/// some action (e.g. opening an in app browser or opening the iTunes store) when handling methods +/// in GADMediatedUnifiedNativeAd. Adapters in such case should notify the Google Mobile Ads SDK by +/// calling the relevant methods from this class. @interface GADMediatedUnifiedNativeAdNotificationSource : NSObject /// Called by the adapter when it has registered an impression on the tracked view. Adapter should @@ -27,16 +28,15 @@ GAD_ASSUME_NONNULL_BEGIN /// Must be called by the adapter just before mediatedNativeAd has opened an in-app modal screen. + (void)mediatedNativeAdWillPresentScreen:(id)mediatedNativeAd; -/// Must be called by the adapter just before the in app modal screen opened by mediatedNativeAd is +/// Must be called by the adapter just before the in-app modal screen opened by mediatedNativeAd is /// dismissed. + (void)mediatedNativeAdWillDismissScreen:(id)mediatedNativeAd; -/// Must be called by the adapter after the in app modal screen opened by mediatedNativeAd is +/// Must be called by the adapter after the in-app modal screen opened by mediatedNativeAd is /// dismissed. + (void)mediatedNativeAdDidDismissScreen:(id)mediatedNativeAd; -/// Must be called by the adapter just before mediatedNativeAd causes another app (such as a browser -/// or the App Store) to take input focus. +/// Must be called by the adapter just before mediatedNativeAd leaves the application. + (void)mediatedNativeAdWillLeaveApplication:(id)mediatedNativeAd; #pragma mark - Mediated Native Video Ad Notifications @@ -52,4 +52,4 @@ GAD_ASSUME_NONNULL_BEGIN @end -GAD_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAd.h new file mode 100644 index 00000000..df31f613 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAd.h @@ -0,0 +1,13 @@ +// +// GADMediationAd.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +/// Rendered ad. Objects conforming to this protocol are created by the adapter and returned to +/// the Google Mobile Ads SDK via the adapter's render method completion handler. +@protocol GADMediationAd +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h new file mode 100644 index 00000000..8aa34245 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h @@ -0,0 +1,51 @@ +// +// GADMediationAdConfiguration.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import + +/// Provided by the Google Mobile Ads SDK for the adapter to render the ad. Contains 3PAS and other +/// ad configuration information. +@interface GADMediationAdConfiguration : NSObject + +/// The ad string returned from the 3PAS. +@property(nonatomic, readonly, nullable) NSString *bidResponse; + +/// View controller to present from. This value must be read at presentation time to obtain the most +/// recent value. Must be accessed on the main queue. +@property(nonatomic, readonly, nullable) UIViewController *topViewController; + +/// Mediation configuration set by the publisher on the AdMob frontend. +@property(nonatomic, readonly, nonnull) GADMediationCredentials *credentials; + +/// PNG data containing a watermark that identifies the ad's source. +@property(nonatomic, readonly, nullable) NSData *watermark; + +/// Extras the publisher registered with -[GADRequest registerAdNetworkExtras:]. +@property(nonatomic, readonly, nullable) id extras; + +/// The value of childDirectedTreatment supplied by the publisher. Is nil if the publisher hasn't +/// specified child directed treatment. Is @YES if child directed treatment is enabled. +@property(nonatomic, readonly, nullable) NSNumber *childDirectedTreatment; + +/// Indicates whether the publisher is requesting test ads. +@property(nonatomic, readonly) BOOL isTestRequest; + +/// Indicates whether the publisher has specified latitude and longitude location. +@property(nonatomic, readonly) BOOL hasUserLocation; + +/// The user's latitude or 0 if location isn't specified. +@property(nonatomic, readonly) CGFloat userLatitude; + +/// The user's longitude or 0 if location isn't specified. +@property(nonatomic, readonly) CGFloat userLongitude; + +/// The user's location accuracy or 0 if location isn't specified. +@property(nonatomic, readonly) CGFloat userLocationAccuracyInMeters; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h new file mode 100644 index 00000000..3c31b790 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h @@ -0,0 +1,90 @@ +// +// GADMediationAdEventDelegate.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import + +/// Reports information to the Google Mobile Ads SDK from the adapter. Adapters receive an ad event +/// delegate when they provide a GADMediationAd by calling a render completion handler. +@protocol GADMediationAdEventDelegate + +/// Notifies Google Mobile Ads SDK that an impression occurred on the GADMediationAd. +- (void)reportImpression; + +/// Notifies Google Mobile Ads SDK that a click occurred on the GADMediationAd. +- (void)reportClick; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd will present a full screen modal view. +- (void)willPresentFullScreenView; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd failed to present with an error. +- (void)didFailToPresentWithError:(nonnull NSError *)error; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd will dismiss a full screen modal view. +- (void)willDismissFullScreenView; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd finished dismissing a full screen modal +/// view. +- (void)didDismissFullScreenView; + +@end + +/// Reports banner related information to the Google Mobile Ads SDK from the adapter. +@protocol GADMediationBannerAdEventDelegate + +/// Notifies Google Mobile Ads SDK that an action on the GADMediationAd will cause the application +/// to move into the background. +- (void)willBackgroundApplication; + +@end + +/// Reports interstitial related information to the Google Mobile Ads SDK from the adapter. +@protocol GADMediationInterstitialAdEventDelegate + +/// Notifies Google Mobile Ads SDK that an action on the GADMediationAd will cause the application +/// to move into the background. +- (void)willBackgroundApplication; + +@end + +/// Reports native related information to the Google Mobile Ads SDK from the adapter. +@protocol GADMediationNativeAdEventDelegate + +/// Notifies Google Mobile Ads SDK that the GADMediationAd started video playback. +- (void)didPlayVideo; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd paused video playback. +- (void)didPauseVideo; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd's video playback finished. +- (void)didEndVideo; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd muted video playback. +- (void)didMuteVideo; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd unmuted video playback. +- (void)didUnmuteVideo; + +/// Notifies Google Mobile Ads SDK that an action on the GADMediationAd will cause the application +/// to move into the background. +- (void)willBackgroundApplication; + +@end + +/// Reports rewarded related information to the Google Mobile Ads SDK from the adapter. +@protocol GADMediationRewardedAdEventDelegate + +/// Notifies the Google Mobile Ads SDK that the GADMediationAd has rewarded the user with a reward. +- (void)didRewardUserWithReward:(nonnull GADAdReward *)reward; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd started video playback. +- (void)didStartVideo; + +/// Notifies Google Mobile Ads SDK that the GADMediationAd's video playback finished. +- (void)didEndVideo; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h index d8e0ad48..06c6e693 100644 --- a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h @@ -6,27 +6,40 @@ // #import -#import + +#import +#import +#import +#import /// Provides information which can be used for making ad requests during mediation. -@protocol GADMediationAdRequest +@protocol GADMediationAdRequest /// Publisher ID set by the publisher on the AdMob frontend. -- (NSString *)publisherId; +- (nullable NSString *)publisherId; /// Mediation configurations set by the publisher on the AdMob frontend. -- (NSDictionary *)credentials; +- (nullable NSDictionary *)credentials; /// Returns YES if the publisher is requesting test ads. - (BOOL)testMode; /// The adapter's ad network extras specified in GADRequest. -- (id)networkExtras; +- (nullable id)networkExtras; /// Returns the value of childDirectedTreatment supplied by the publisher. Returns nil if the /// publisher hasn't specified child directed treatment. Returns @YES if child directed treatment is /// enabled. -- (NSNumber *)childDirectedTreatment; +- (nullable NSNumber *)childDirectedTreatment; + +/// Returns the maximum ad content rating supplied by the publisher. Returns nil if the publisher +/// hasn't specified a max ad content rating. +- (nullable GADMaxAdContentRating)maxAdContentRating; + +/// Returns the value of underAgeOfConsent supplied by the publisher. Returns nil if the publisher +/// hasn't specified the user is under the age of consent. Returns @YES if the user is under the age +/// of consent. +- (nullable NSNumber *)underAgeOfConsent; /// Returns YES if the publisher has specified latitude and longitude location. - (BOOL)userHasLocation; @@ -41,10 +54,10 @@ - (CGFloat)userLocationAccuracyInMeters; /// Returns user's location description. May return a value even if userHasLocation is NO. -- (NSString *)userLocationDescription; +- (nullable NSString *)userLocationDescription; /// Keywords describing the user's current activity. Example: @"Sport Scores". -- (NSArray *)userKeywords; +- (nullable NSArray *)userKeywords; #pragma mark Deprecated @@ -54,6 +67,6 @@ /// Deprecated. The end user's birthday set by the publisher. Returns nil if it has not been /// specified. -- (NSDate *)userBirthday GAD_DEPRECATED_ATTRIBUTE; +- (nullable NSDate *)userBirthday GAD_DEPRECATED_ATTRIBUTE; @end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdSize.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdSize.h new file mode 100644 index 00000000..851ec9b9 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdSize.h @@ -0,0 +1,15 @@ +// +// GADMediationAdSize.h +// Google Mobile Ads SDK +// +// Copyright 2019 Google. All rights reserved. +// + +#import + +/// Returns the closest valid ad size from possibleAdSizes as compared to |original|. The selected +/// size must be smaller than or equal in size to the original. The selected size must also be +/// within a configurable fraction of the width and height of the original. If no valid size exists, +/// returns kGADAdSizeInvalid. +GAD_EXTERN GADAdSize GADClosestValidSizeForAdSizes(GADAdSize original, + NSArray *_Nonnull possibleAdSizes); diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h new file mode 100644 index 00000000..6243a36e --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h @@ -0,0 +1,105 @@ +// +// GADMediationAdapter.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +#import +#import +#import +#import +#import +#import +#import +#import + +/// Called by the adapter after loading the banner ad or encountering an error. Returns an ad +/// event object to send ad events to the Google Mobile Ads SDK. The block returns nil if a delegate +/// couldn't be created or if the block has already been called. +typedef id _Nullable (^GADMediationBannerLoadCompletionHandler)( + _Nullable id ad, NSError *_Nullable error); + +/// Called by the adapter after loading the interstitial ad or encountering an error. Returns an +/// ad event delegate to send ad events to the Google Mobile Ads SDK. The block returns nil if a +/// delegate couldn't be created or if the block has already been called. +typedef id _Nullable ( + ^GADMediationInterstitialLoadCompletionHandler)(_Nullable id ad, + NSError *_Nullable error); + +/// Called by the adapter after loading the native ad or encountering an error. Returns an ad +/// event delegate to send ad events to the Google Mobile Ads SDK. The block returns nil if a +/// delegate couldn't be created or if the block has already been called. +typedef id _Nullable (^GADMediationNativeLoadCompletionHandler)( + _Nullable id ad, NSError *_Nullable error); + +/// Called by the adapter after loading the rewarded ad or encountering an error. Returns an ad +/// event delegate to send ad events to the Google Mobile Ads SDK. The block returns nil if a +/// delegate couldn't be created or if the block has already been called. +typedef id _Nullable ( + ^GADMediationRewardedLoadCompletionHandler)(_Nullable id ad, + NSError *_Nullable error); + +/// Executes when adapter set up completes. +typedef void (^GADMediationAdapterSetUpCompletionBlock)(NSError *_Nullable error); + +@protocol GADAdNetworkExtras; + +/// Receives messages and requests from the Google Mobile Ads SDK. Provides GMA to 3P SDK +/// communication. +/// +/// Adapters are initialized on a background queue and should avoid using the main queue until +/// load time. +@protocol GADMediationAdapter +/// Returns the adapter version. ++ (GADVersionNumber)version; + +/// Returns the ad SDK version. ++ (GADVersionNumber)adSDKVersion; + +/// The extras class that is used to specify additional parameters for a request to this ad network. +/// Returns Nil if the network doesn't have publisher provided extras. ++ (nullable Class)networkExtrasClass; + +@optional + +/// Tells the adapter to set up its underlying ad network SDK and perform any necessary prefetching +/// or configuration work. The adapter must call completionHandler once the adapter can service ad +/// requests, or if it encounters an error while setting up. ++ (void)setUpWithConfiguration:(nonnull GADMediationServerConfiguration *)configuration + completionHandler:(nonnull GADMediationAdapterSetUpCompletionBlock)completionHandler; + +/// Asks the adapter to load a banner ad with the provided ad configuration. The adapter must call +/// back completionHandler with the loaded ad, or it may call back with an error. This method is +/// called on the main thread, and completionHandler must be called back on the main thread. +- (void)loadBannerForAdConfiguration:(nonnull GADMediationBannerAdConfiguration *)adConfiguration + completionHandler: + (nonnull GADMediationBannerLoadCompletionHandler)completionHandler; + +/// Asks the adapter to load an interstitial ad with the provided ad configuration. The adapter +/// must call back completionHandler with the loaded ad, or it may call back with an error. This +/// method is called on the main thread, and completionHandler must be called back on the main +/// thread. +- (void)loadInterstitialForAdConfiguration: + (nonnull GADMediationInterstitialAdConfiguration *)adConfiguration + completionHandler:(nonnull GADMediationInterstitialLoadCompletionHandler) + completionHandler; + +/// Asks the adapter to load a native ad with the provided ad configuration. The adapter must call +/// back completionHandler with the loaded ad, or it may call back with an error. This method is +/// called on the main thread, and completionHandler must be called back on the main thread. +- (void)loadNativeAdForAdConfiguration:(nonnull GADMediationNativeAdConfiguration *)adConfiguration + completionHandler: + (nonnull GADMediationNativeLoadCompletionHandler)completionHandler; + +/// Asks the adapter to load a rewarded ad with the provided ad configuration. The adapter must +/// call back completionHandler with the loaded ad, or it may call back with an error. This method +/// is called on the main thread, and completionHandler must be called back on the main thread. +- (void)loadRewardedAdForAdConfiguration: + (nonnull GADMediationRewardedAdConfiguration *)adConfiguration + completionHandler: + (nonnull GADMediationRewardedLoadCompletionHandler)completionHandler; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationBannerAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationBannerAd.h new file mode 100644 index 00000000..81135b99 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationBannerAd.h @@ -0,0 +1,28 @@ +// +// GADMediationBannerAd.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import +#import + +/// Rendered banner ad. Provides a single subview to add to the banner view's view hierarchy. +@protocol GADMediationBannerAd +@property(nonatomic, readonly, nonnull) UIView *view; + +@optional + +/// Tells the ad to resize the banner. Implement if banner content is resizable. +- (void)changeAdSizeTo:(GADAdSize)adSize; +@end + +@interface GADMediationBannerAdConfiguration : GADMediationAdConfiguration +/// Banner ad size requested of the adapter. +@property(nonatomic, readonly) GADAdSize adSize; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationInterstitialAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationInterstitialAd.h new file mode 100644 index 00000000..f101a20b --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationInterstitialAd.h @@ -0,0 +1,19 @@ +// +// GADMediationInterstitialAd.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import + +/// Rendered interstitial ad. +@protocol GADMediationInterstitialAd +- (void)presentFromViewController:(nonnull UIViewController *)viewController; +@end + +@interface GADMediationInterstitialAdConfiguration : GADMediationAdConfiguration +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationNativeAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationNativeAd.h new file mode 100644 index 00000000..4ca73141 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationNativeAd.h @@ -0,0 +1,43 @@ +// +// GADMediationNativeAd.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import +#import +#import +#import + +/// Rendered native ad. +// TODO(burnse): Remove the dependency on GADMediatedUnifiedNativeAd by copying API to this protocol +// directly once legacy mediation APIs have been deprecated. +@protocol GADMediationNativeAd + +@optional + +/// Indicates whether the ad handles user clicks. If this method returns YES, the ad must handle +/// user clicks and notify the Google Mobile Ads SDK of clicks using +/// -[GADMediationAdEventDelegate reportClick:]. If this method returns NO, the Google Mobile Ads +/// SDK handles user clicks and notifies the ad of clicks using -[GADMediationNativeAd +/// didRecordClickOnAssetWithName:view:viewController:]. +- (BOOL)handlesUserClicks; + +/// Indicates whether the ad handles user impressions tracking. If this method returns YES, the +/// Google Mobile Ads SDK will not track user impressions and the ad must notify the +/// Google Mobile Ads SDK of impressions using -[GADMediationAdEventDelegate +/// reportImpression:]. If this method returns NO, the Google Mobile Ads SDK tracks user impressions +/// and notifies the ad of impressions using -[GADMediationNativeAd didRecordImpression:]. +- (BOOL)handlesUserImpressions; +@end + +@interface GADMediationNativeAdConfiguration : GADMediationAdConfiguration + +/// Additional options configured by the publisher for requesting a native ad. +@property(nonatomic, readonly, nonnull) NSArray *options; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationRewardedAd.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationRewardedAd.h new file mode 100644 index 00000000..3632acf0 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationRewardedAd.h @@ -0,0 +1,19 @@ +// +// GADMediationRewardedAd.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import + +/// Rendered rewarded ad. +@protocol GADMediationRewardedAd +- (void)presentFromViewController:(nonnull UIViewController *)viewController; +@end + +@interface GADMediationRewardedAdConfiguration : GADMediationAdConfiguration +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationServerConfiguration.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationServerConfiguration.h new file mode 100644 index 00000000..9f9ea684 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADMediationServerConfiguration.h @@ -0,0 +1,29 @@ +// +// GADMediationServerConfiguration.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import + +/// Mediation configuration set by the publisher on the AdMob UI. +@interface GADMediationCredentials : NSObject + +/// The AdMob UI settings. +@property(nonatomic, readonly, nonnull) NSDictionary *settings; + +/// The ad format associated with the credentials. +@property(nonatomic, readonly) GADAdFormat format; + +@end + +/// Third party SDK configuration. +@interface GADMediationServerConfiguration : NSObject + +/// Array of mediation configurations set by the publisher on the AdMob UI. Each configuration is a +/// possible credential dictionary that the Google Mobile Ads SDK may provide at ad request time. +@property(nonatomic, readonly, nonnull) NSArray *credentials; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADVersionNumber.h b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADVersionNumber.h new file mode 100644 index 00000000..8059dcbf --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/Mediation/GADVersionNumber.h @@ -0,0 +1,15 @@ +// +// GADVersionNumber.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +/// Version number information. +typedef struct { + NSInteger majorVersion; ///< Major version. + NSInteger minorVersion; ///< Minor version. + NSInteger patchVersion; ///< Patch version. +} GADVersionNumber; diff --git a/ios/platform/GoogleMobileAds.framework/Headers/RTBMediation/GADRTBAdapter.h b/ios/platform/GoogleMobileAds.framework/Headers/RTBMediation/GADRTBAdapter.h new file mode 100644 index 00000000..a344f082 --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/RTBMediation/GADRTBAdapter.h @@ -0,0 +1,28 @@ +// +// GADRTBAdapter.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import + +#import +#import + +/// Completion handler for signal generation. Returns either signals or an error object. +typedef void (^GADRTBSignalCompletionHandler)(NSString *_Nullable signals, + NSError *_Nullable error); + +/// Adapter that provides signals to the Google Mobile Ads SDK to be included in an OpenRTB auction. +@protocol GADRTBAdapter + +/// Asks the receiver for encrypted signals. Signals are provided to the 3PAS at request time. The +/// receiver must call completionHandler with signals or an error. +/// +/// This method is called on a non-main thread. The receiver should avoid using the main thread to +/// prevent signal collection timeouts. +- (void)collectSignalsForRequestParameters:(nonnull GADRTBRequestParameters *)params + completionHandler:(nonnull GADRTBSignalCompletionHandler)completionHandler; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Headers/RTBMediation/GADRTBRequestParameters.h b/ios/platform/GoogleMobileAds.framework/Headers/RTBMediation/GADRTBRequestParameters.h new file mode 100644 index 00000000..1fad5b7a --- /dev/null +++ b/ios/platform/GoogleMobileAds.framework/Headers/RTBMediation/GADRTBRequestParameters.h @@ -0,0 +1,37 @@ +// +// GADRTBRequestParameters.h +// Google Mobile Ads SDK +// +// Copyright 2018 Google LLC. All rights reserved. +// + +#import +#import +#import +#import + +/// Mediation configuration for a particular ad request. +@interface GADRTBMediationSignalsConfiguration : NSObject + +/// Array of mediation credential configurations set by the publisher on the AdMob UI. Each +/// credential configuration is a possible source of ads for the request. The real-time bidding +/// request will include a subset of these configurations. +@property(nonatomic, readonly, nonnull) NSArray *credentials; + +@end + +/// Request parameters provided by the publisher and Google Mobile Ads SDK. +@interface GADRTBRequestParameters : NSObject + +/// Mediation configuration for this request set by the publisher on the AdMob UI. +@property(nonatomic, readonly, nonnull) GADRTBMediationSignalsConfiguration *configuration; + +/// Extras the publisher registered with -[GADRequest registerAdNetworkExtras:]. +@property(nonatomic, readonly, nullable) id extras; + +#pragma mark - Banner parameters + +/// Requested banner ad size. The ad size is kGADAdSizeInvalid for non-banner requests. +@property(nonatomic, readonly) GADAdSize adSize; + +@end diff --git a/ios/platform/GoogleMobileAds.framework/Modules/module.modulemap b/ios/platform/GoogleMobileAds.framework/Modules/module.modulemap index dfee2822..50910695 100644 --- a/ios/platform/GoogleMobileAds.framework/Modules/module.modulemap +++ b/ios/platform/GoogleMobileAds.framework/Modules/module.modulemap @@ -4,22 +4,22 @@ framework module GoogleMobileAds { export * module * { export * } + link "sqlite3" + link "z" + link framework "AdSupport" link framework "AudioToolbox" link framework "AVFoundation" link framework "CFNetwork" link framework "CoreGraphics" link framework "CoreMedia" - link framework "CoreMotion" link framework "CoreTelephony" link framework "CoreVideo" link framework "Foundation" - link framework "GLKit" link framework "JavaScriptCore" link framework "MediaPlayer" link framework "MessageUI" link framework "MobileCoreServices" - link framework "OpenGLES" link framework "QuartzCore" link framework "SafariServices" link framework "Security" @@ -30,26 +30,36 @@ framework module GoogleMobileAds { header "GoogleMobileAdsDefines.h" + header "GADMobileAds.h" + + header "GADAdFormat.h" + header "GADAdMetadataKeys.h" header "GADAdNetworkExtras.h" header "GADAdSize.h" - header "GADAudioVideoManagerDelegate.h" + header "GADAppOpenAd.h" header "GADAudioVideoManager.h" + header "GADAudioVideoManagerDelegate.h" header "GADBannerView.h" header "GADBannerViewDelegate.h" - header "GADCorrelator.h" - header "GADCorrelatorAdLoaderOptions.h" header "GADDebugOptionsViewController.h" + header "GADDisplayAdMeasurement.h" header "GADExtras.h" header "GADInAppPurchase.h" header "GADInAppPurchaseDelegate.h" + header "GADInitializationStatus.h" + header "GADInstreamAd.h" + header "GADInstreamAdView.h" header "GADInterstitial.h" header "GADInterstitialDelegate.h" + header "GADMediaAspectRatio.h" + header "GADMediaContent.h" header "GADMediaView.h" - header "GADMobileAds.h" header "GADNativeExpressAdView.h" header "GADNativeExpressAdViewDelegate.h" header "GADRequest.h" + header "GADRequestConfiguration.h" header "GADRequestError.h" + header "GADResponseInfo.h" header "GADVideoController.h" header "GADVideoControllerDelegate.h" header "GADVideoOptions.h" @@ -73,20 +83,21 @@ framework module GoogleMobileAds { header "GADNativeAdDelegate.h" header "GADNativeAdImage.h" header "GADNativeAdImage+Mediation.h" - header "GADNativeAppInstallAd.h" - header "GADNativeAppInstallAdAssetIDs.h" - header "GADNativeContentAd.h" - header "GADNativeContentAdAssetIDs.h" header "GADNativeCustomTemplateAd.h" header "GADUnifiedNativeAd.h" header "GADUnifiedNativeAd+ConfirmationClick.h" + header "GADUnifiedNativeAd+CustomClickGesture.h" header "GADUnifiedNativeAdAssetIdentifiers.h" header "GADUnifiedNativeAdDelegate.h" header "GADUnifiedNativeAdUnconfirmedClickDelegate.h" + header "GADDelayedAdRenderingOptions.h" header "GADMultipleAdsAdLoaderOptions.h" + header "GADMuteThisAdReason.h" header "GADNativeAdImageAdLoaderOptions.h" + header "GADNativeAdMediaAdLoaderOptions.h" header "GADNativeAdViewAdOptions.h" + header "GADNativeMuteThisAdLoaderOptions.h" header "GADCustomEventBanner.h" header "GADCustomEventBannerDelegate.h" @@ -105,18 +116,35 @@ framework module GoogleMobileAds { header "GADAdReward.h" header "GADRewardBasedVideoAd.h" header "GADRewardBasedVideoAdDelegate.h" + header "GADRewardedAd.h" + header "GADRewardedAdDelegate.h" + header "GADRewardedAdMetadataDelegate.h" + header "GADServerSideVerificationOptions.h" header "Mediation/GADMAdNetworkAdapterProtocol.h" header "Mediation/GADMAdNetworkConnectorProtocol.h" header "Mediation/GADMediatedNativeAd.h" header "Mediation/GADMediatedNativeAdDelegate.h" header "Mediation/GADMediatedNativeAdNotificationSource.h" - header "Mediation/GADMediatedNativeAppInstallAd.h" - header "Mediation/GADMediatedNativeContentAd.h" header "Mediation/GADMediatedUnifiedNativeAd.h" header "Mediation/GADMediatedUnifiedNativeAdNotificationSource.h" + header "Mediation/GADMediationAd.h" + header "Mediation/GADMediationAdapter.h" + header "Mediation/GADMediationAdConfiguration.h" + header "Mediation/GADMediationAdEventDelegate.h" header "Mediation/GADMediationAdRequest.h" + header "Mediation/GADMediationAdSize.h" + header "Mediation/GADMediationBannerAd.h" + header "Mediation/GADMediationInterstitialAd.h" + header "Mediation/GADMediationNativeAd.h" + header "Mediation/GADMediationRewardedAd.h" + header "Mediation/GADMediationServerConfiguration.h" header "Mediation/GADMEnums.h" header "Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h" header "Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h" + header "Mediation/GADVersionNumber.h" + + + header "RTBMediation/GADRTBAdapter.h" + header "RTBMediation/GADRTBRequestParameters.h" }