cordova-admob-tomitank 1.0.12 → 1.1.1

package/README.md

@@ -2,7 +2,7 @@
 
 Based on AdMob Plus Cordova with updated SDK-s
 - Android: 24.4.0
-- iOS: 11.13.0
+- iOS: 12.7.0
 
 [![](https://img.shields.io/static/v1?label=Sponsor%20Me&style=for-the-badge&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/tomitank)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-admob-tomitank",
-  "version": "1.0.12",
+  "version": "1.1.1",
   "description": "Trustable Google AdMob Cordova Plugin",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-admob-tomitank" version="1.0.12"
+<plugin id="cordova-admob-tomitank" version="1.1.1"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <name>cordova-admob-tomitank</name>
@@ -317,7 +317,7 @@
                 <source url="https://cdn.cocoapods.org/" />
             </config>
             <pods use-frameworks="true">
-                <pod name="Google-Mobile-Ads-SDK" spec="~> 11.13.0" />
+                <pod name="Google-Mobile-Ads-SDK" spec="~> 12.7.0" />
             </pods>
         </podspec>
     </platform>

package/src/ios/AMBAdBase.swift

@@ -42,7 +42,7 @@ class AMBAdBase: AMBCoreAd {
         self.emit(eventName, ["message": error.localizedDescription])
     }
 
-    func emit(_ eventName: String, _ reward: GADAdReward) {
+    func emit(_ eventName: String, _ reward: AdReward) {
         self.emit(eventName, [
             "reward": [
                 "amount": reward.amount,
@@ -51,7 +51,7 @@ class AMBAdBase: AMBCoreAd {
         ])
     }
 
-    func emit(_ eventName: String, _ adSize: GADAdSize) {
+    func emit(_ eventName: String, _ adSize: AdSize) {
         self.emit(eventName, [
             "size": [
                 "width": adSize.size.width,
@@ -66,7 +66,7 @@ class AMBAdBase: AMBCoreAd {
         plugin.emit(eventName, data: d)
     }
 
-    func emit(_ eventName: String, _ nativeAd: GADNativeAd) {
+    func emit(_ eventName: String, _ nativeAd: NativeAd) {
         plugin.emit(eventName, data: ["adId": nativeAd.hashValue])
     }
 }

package/src/ios/AMBAppOpenAd.swift

@@ -1,9 +1,9 @@
 import Foundation
 import GoogleMobileAds
 
-class AMBAppOpenAd: AMBAdBase, GADFullScreenContentDelegate {
+class AMBAppOpenAd: AMBAdBase, FullScreenContentDelegate {
 
-    var mAd: GADAppOpenAd?
+    var mAd: AppOpenAd?
 
     convenience init?(_ ctx: AMBContext) {
         guard let id = ctx.optId(),
@@ -13,7 +13,7 @@ class AMBAppOpenAd: AMBAdBase, GADFullScreenContentDelegate {
         }
         self.init(id: id,
                   adUnitId: adUnitId,
-                  adRequest: ctx.optGADRequest())
+                  adRequest: ctx.optRequest())
     }
 
     deinit {
@@ -27,7 +27,7 @@ class AMBAppOpenAd: AMBAdBase, GADFullScreenContentDelegate {
     override func load(_ ctx: AMBContext) {
         clear()
 
-        GADAppOpenAd.load(
+        AppOpenAd.load(
             withAdUnitID: self.adUnitId,
             request: adRequest,
             completionHandler: { (ad, error) in
@@ -45,23 +45,23 @@ class AMBAppOpenAd: AMBAdBase, GADFullScreenContentDelegate {
     }
 
     override func show(_ ctx: AMBContext) {
-        mAd?.present(fromRootViewController: AMBContext.plugin.viewController)
+        mAd?.present(from: AMBContext.plugin.viewController)
     }
 
-    func adDidRecordImpression(_ ad: GADFullScreenPresentingAd) {
+    func adDidRecordImpression(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adImpression)
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         clear()
         self.emit(AMBEvents.adShowFail, error)
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adShow)
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         clear()
         self.emit(AMBEvents.adDismiss)
     }

package/src/ios/AMBBanner.swift

@@ -37,7 +37,7 @@ class AMBBannerStackView: UIStackView {
     }
 }
 
-class AMBBanner: AMBAdBase, GADBannerViewDelegate, GADAdSizeDelegate {
+class AMBBanner: AMBAdBase, BannerViewDelegate, AdSizeDelegate {
     static let stackView = AMBBannerStackView.shared
 
     static let priortyLeast = UILayoutPriority(10)
@@ -121,13 +121,13 @@ class AMBBanner: AMBAdBase, GADBannerViewDelegate, GADAdSizeDelegate {
         AMBBannerStackView.bottomConstraint.isActive = stackView.hasBottomBanner
     }
 
-    let adSize: GADAdSize!
+    let adSize: AdSize!
     let position: String!
     let offset: CGFloat?
-    var bannerView: GADBannerView!
+    var bannerView: BannerView!
     let placeholder = AMBBannerPlaceholder()
 
-    init(id: String, adUnitId: String, adSize: GADAdSize, adRequest: GADRequest, position: String, offset: CGFloat?) {
+    init(id: String, adUnitId: String, adSize: AdSize, adRequest: Request, position: String, offset: CGFloat?) {
         self.adSize = adSize
         self.position = position
         self.offset = offset
@@ -144,7 +144,7 @@ class AMBBanner: AMBAdBase, GADBannerViewDelegate, GADAdSizeDelegate {
         self.init(id: id,
                   adUnitId: adUnitId,
                   adSize: ctx.optAdSize(),
-                  adRequest: ctx.optGADRequest(),
+                  adRequest: ctx.optRequest(),
                   position: ctx.optPosition(),
                   offset: ctx.optOffset())
     }
@@ -165,7 +165,7 @@ class AMBBanner: AMBAdBase, GADBannerViewDelegate, GADAdSizeDelegate {
 
     override func load(_ ctx: AMBContext) {
         if bannerView == nil {
-            bannerView = GADBannerView(adSize: self.adSize)
+            bannerView = BannerView(adSize: self.adSize)
             bannerView.delegate = self
             bannerView.adSizeDelegate = self
             bannerView.rootViewController = plugin.viewController
@@ -217,7 +217,7 @@ class AMBBanner: AMBAdBase, GADBannerViewDelegate, GADAdSizeDelegate {
         ctx.resolve()
     }
 
-    func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
+    func bannerViewDidReceiveAd(_ bannerView: BannerView) {
         self.emit(AMBEvents.adLoad, [
             "size": [
                 "width": bannerView.frame.size.width,
@@ -237,35 +237,35 @@ class AMBBanner: AMBAdBase, GADBannerViewDelegate, GADAdSizeDelegate {
         ])
     }
 
-    func bannerView(_ bannerView: GADBannerView,
+    func bannerView(_ bannerView: BannerView,
                     didFailToReceiveAdWithError error: Error) {
         self.emit(AMBEvents.adLoadFail, error)
         self.emit(AMBEvents.bannerLoadFail, error)
     }
 
-    func bannerViewDidRecordImpression(_ bannerView: GADBannerView) {
+    func bannerViewDidRecordImpression(_ bannerView: BannerView) {
         self.emit(AMBEvents.adImpression)
         self.emit(AMBEvents.bannerImpression)
     }
 
-    func bannerViewDidRecordClick(_ bannerView: GADBannerView) {
+    func bannerViewDidRecordClick(_ bannerView: BannerView) {
         self.emit(AMBEvents.adClick)
     }
 
-    func bannerViewWillPresentScreen(_ bannerView: GADBannerView) {
+    func bannerViewWillPresentScreen(_ bannerView: BannerView) {
         self.emit(AMBEvents.adShow)
         self.emit(AMBEvents.bannerOpen)
     }
 
-    func bannerViewWillDismissScreen(_ bannerView: GADBannerView) {
+    func bannerViewWillDismissScreen(_ bannerView: BannerView) {
     }
 
-    func bannerViewDidDismissScreen(_ bannerView: GADBannerView) {
+    func bannerViewDidDismissScreen(_ bannerView: BannerView) {
         self.emit(AMBEvents.adDismiss)
         self.emit(AMBEvents.bannerClose)
     }
 
-    func adView(_ bannerView: GADBannerView, willChangeAdSizeTo size: GADAdSize) {
+    func adView(_ bannerView: BannerView, willChangeAdSizeTo size: AdSize) {
         self.emit(AMBEvents.bannerSizeChange, size)
     }
 

package/src/ios/AMBContext.swift

@@ -100,19 +100,19 @@ class AMBContext: AMBCoreContext {
     }
 
     // swiftlint:disable cyclomatic_complexity
-    func optAdSize() -> GADAdSize {
+    func optAdSize() -> AdSize {
         if let adSizeType = opt("size") as? Int {
             switch adSizeType {
             case 0:
-                return GADAdSizeBanner
+                return AdSizeBanner
             case 1:
-                return GADAdSizeLargeBanner
+                return AdSizeLargeBanner
             case 2:
-                return GADAdSizeMediumRectangle
+                return AdSizeMediumRectangle
             case 3:
-                return GADAdSizeFullBanner
+                return AdSizeFullBanner
             case 4:
-                return GADAdSizeLeaderboard
+                return AdSizeLeaderboard
             default: break
             }
         }
@@ -124,35 +124,35 @@ class AMBContext: AMBCoreContext {
                 }
                 if adaptive == "inline",
                     let maxHeight = adSizeDict["maxHeight"] as? CGFloat {
-                    return GADInlineAdaptiveBannerAdSizeWithWidthAndMaxHeight(width, maxHeight)
+                    return inlineAdaptiveBanner(width: width, maxHeight: maxHeight)
                 } else {
                     switch adSizeDict["orientation"] as? String {
                     case "portrait":
-                        return GADPortraitAnchoredAdaptiveBannerAdSizeWithWidth(width)
+                        return portraitAnchoredAdaptiveBanner(width: width)
                     case "landscape":
-                        return GADLandscapeAnchoredAdaptiveBannerAdSizeWithWidth(width)
+                        return landscapeAnchoredAdaptiveBanner(width: width)
                     default:
-                        return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(width)
+                        return currentOrientationAnchoredAdaptiveBanner(width: width)
                     }
                 }
             } else if let width = adSizeDict["width"] as? Int,
                  let height = adSizeDict["height"] as? Int {
-                return GADAdSizeFromCGSize(CGSize(width: width, height: height))
+                return adSizeFor(cgSize: CGSize(width: width, height: height))
             }
         }
-        return GADAdSizeBanner
+        return AdSizeBanner
     }
     // swiftlint:enable cyclomatic_complexity
 
-    func optGADServerSideVerificationOptions() -> GADServerSideVerificationOptions? {
+    func optServerSideVerificationOptions() -> ServerSideVerificationOptions? {
         guard let ssv = opt("serverSideVerification") as? NSDictionary
         else {
             return nil
         }
 
-        let options = GADServerSideVerificationOptions.init()
+        let options = ServerSideVerificationOptions.init()
         if let customData = ssv.value(forKey: "customData") as? String {
-            options.customRewardString = customData
+            options.customRewardText = customData
         }
         if let userId = ssv.value(forKey: "userId") as? String {
             options.userIdentifier = userId

package/src/ios/AMBCore.swift

@@ -134,15 +134,15 @@ extension AMBCoreContext {
         return optStringArray("testDeviceIds")
     }
 
-    func optGADRequest() -> GADRequest {
-        let request = GADRequest()
+    func optRequest() -> Request {
+        let request = Request()
         if let contentURL = optString("contentUrl") {
             request.contentURL = contentURL
         }
         if let keywords = optStringArray("keywords") {
             request.keywords = keywords
         }
-        let extras = GADExtras()
+        let extras = Extras()
         if let npa = optString("npa") {
             extras.additionalParameters = ["npa": npa]
         }
@@ -168,13 +168,13 @@ extension AMBCoreContext {
 
     func configure() {
         if let muted = optAppMuted() {
-            GADMobileAds.sharedInstance().applicationMuted = muted
+            MobileAds.shared.isApplicationMuted = muted
         }
         if let volume = optAppVolume() {
-            GADMobileAds.sharedInstance().applicationVolume = volume
+            MobileAds.shared.applicationVolume = volume
         }
 
-        let requestConfiguration = GADMobileAds.sharedInstance().requestConfiguration
+        let requestConfiguration = MobileAds.shared.requestConfiguration
         if let maxAdContentRating = optMaxAdContentRating() {
             requestConfiguration.maxAdContentRating = maxAdContentRating
         }
@@ -204,9 +204,9 @@ class AMBCoreAd: NSObject {
 
     let id: String
     let adUnitId: String
-    let adRequest: GADRequest
+    let adRequest: Request
 
-    init(id: String, adUnitId: String, adRequest: GADRequest) {
+    init(id: String, adUnitId: String, adRequest: Request) {
         self.id = id
         self.adUnitId = adUnitId
         self.adRequest = adRequest
@@ -222,7 +222,7 @@ class AMBCoreAd: NSObject {
         else {
             return nil
         }
-        self.init(id: id, adUnitId: adUnitId, adRequest: ctx.optGADRequest())
+        self.init(id: id, adUnitId: adUnitId, adRequest: ctx.optRequest())
     }
 
     deinit {

package/src/ios/AMBInterstitial.swift

@@ -1,7 +1,7 @@
 import GoogleMobileAds
 
-class AMBInterstitial: AMBAdBase, GADFullScreenContentDelegate {
-    var mAd: GADInterstitialAd?
+class AMBInterstitial: AMBAdBase, FullScreenContentDelegate {
+    var mAd: InterstitialAd?
 
     deinit {
         clear()
@@ -14,8 +14,8 @@ class AMBInterstitial: AMBAdBase, GADFullScreenContentDelegate {
     override func load(_ ctx: AMBContext) {
         clear()
 
-        GADInterstitialAd.load(
-            withAdUnitID: adUnitId,
+        InterstitialAd.load(
+            with: adUnitId,
             request: adRequest,
             completionHandler: { ad, error in
                 if error != nil {
@@ -36,27 +36,27 @@ class AMBInterstitial: AMBAdBase, GADFullScreenContentDelegate {
     }
 
     override func show(_ ctx: AMBContext) {
-        mAd?.present(fromRootViewController: plugin.viewController)
+        mAd?.present(from: plugin.viewController)
         ctx.resolve()
     }
 
-    func adDidRecordImpression(_ ad: GADFullScreenPresentingAd) {
+    func adDidRecordImpression(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adImpression)
         self.emit(AMBEvents.interstitialImpression)
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         clear()
         self.emit(AMBEvents.adShowFail, error)
         self.emit(AMBEvents.interstitialShowFail, error)
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adShow)
         self.emit(AMBEvents.interstitialShow)
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         clear()
         self.emit(AMBEvents.adDismiss)
         self.emit(AMBEvents.interstitialDismiss)

package/src/ios/AMBNativeAd.swift

@@ -2,7 +2,7 @@ import Foundation
 import GoogleMobileAds
 
 protocol AMBNativeAdViewProvider: NSObjectProtocol {
-    func createView(_ nativeAd: GADNativeAd) -> UIView
+    func createView(_ nativeAd: NativeAd) -> UIView
     // delegate
     func didShow(_ ad: AMBNativeAd)
     func didHide(_ ad: AMBNativeAd)
@@ -13,24 +13,24 @@ extension AMBNativeAdViewProvider {
     func didHide(_ ad: AMBNativeAd) {}
 }
 
-class AMBNativeAd: AMBAdBase, GADNativeAdLoaderDelegate, GADNativeAdDelegate {
+class AMBNativeAd: AMBAdBase, NativeAdLoaderDelegate, NativeAdDelegate {
     static var providers = [String: AMBNativeAdViewProvider]()
 
-    var mLoader: GADAdLoader!
+    var mLoader: AdLoader!
     let viewProvider: AMBNativeAdViewProvider
-    var mAd: GADNativeAd?
+    var mAd: NativeAd?
     var ctxLoad: AMBContext?
 
     lazy var view: UIView = {
         return viewProvider.createView(mAd!)
     }()
 
-    init(id: String, adUnitId: String, adRequest: GADRequest, viewProvider: AMBNativeAdViewProvider) {
+    init(id: String, adUnitId: String, adRequest: Request, viewProvider: AMBNativeAdViewProvider) {
         self.viewProvider = viewProvider
 
         super.init(id: id, adUnitId: adUnitId, adRequest: adRequest)
 
-        mLoader = GADAdLoader(adUnitID: adUnitId, rootViewController: plugin.viewController,
+        mLoader = AdLoader(adUnitID: adUnitId, rootViewController: plugin.viewController,
                               adTypes: [.native], options: nil)
         mLoader.delegate = self
     }
@@ -45,7 +45,7 @@ class AMBNativeAd: AMBAdBase, GADNativeAdLoaderDelegate, GADNativeAdDelegate {
         }
         self.init(id: id,
                   adUnitId: adUnitId,
-                  adRequest: ctx.optGADRequest(),
+                  adRequest: ctx.optRequest(),
                   viewProvider: viewProvider)
     }
 
@@ -83,7 +83,7 @@ class AMBNativeAd: AMBAdBase, GADNativeAdLoaderDelegate, GADNativeAdDelegate {
         ctx.resolve()
     }
 
-    func adLoader(_ adLoader: GADAdLoader, didReceive nativeAd: GADNativeAd) {
+    func adLoader(_ adLoader: AdLoader, didReceive nativeAd: NativeAd) {
         mAd = nativeAd
         nativeAd.delegate = self
         self.emit(AMBEvents.adLoad)
@@ -93,7 +93,7 @@ class AMBNativeAd: AMBAdBase, GADNativeAdLoaderDelegate, GADNativeAdDelegate {
         }
     }
 
-    func adLoader(_ adLoader: GADAdLoader, didFailToReceiveAdWithError error: Error) {
+    func adLoader(_ adLoader: AdLoader, didFailToReceiveAdWithError error: Error) {
         self.emit(AMBEvents.adLoadFail, error)
         if !adLoader.isLoading {
             ctxLoad?.reject(error)
@@ -101,27 +101,27 @@ class AMBNativeAd: AMBAdBase, GADNativeAdLoaderDelegate, GADNativeAdDelegate {
         }
     }
 
-    func nativeAdDidRecordImpression(_ nativeAd: GADNativeAd) {
+    func nativeAdDidRecordImpression(_ nativeAd: NativeAd) {
         self.emit(AMBEvents.adImpression, nativeAd)
     }
 
-    func nativeAdDidRecordClick(_ nativeAd: GADNativeAd) {
+    func nativeAdDidRecordClick(_ nativeAd: NativeAd) {
         self.emit(AMBEvents.adClick, nativeAd)
     }
 
-    func nativeAdWillPresentScreen(_ nativeAd: GADNativeAd) {
+    func nativeAdWillPresentScreen(_ nativeAd: NativeAd) {
         self.emit(AMBEvents.adShow, nativeAd)
     }
 
-    func nativeAdWillDismissScreen(_ nativeAd: GADNativeAd) {
+    func nativeAdWillDismissScreen(_ nativeAd: NativeAd) {
         // The native ad will dismiss a full screen view.
     }
 
-    func nativeAdDidDismissScreen(_ nativeAd: GADNativeAd) {
+    func nativeAdDidDismissScreen(_ nativeAd: NativeAd) {
         self.emit(AMBEvents.adDismiss, nativeAd)
     }
 
-    func nativeAdWillLeaveApplication(_ nativeAd: GADNativeAd) {
+    func nativeAdWillLeaveApplication(_ nativeAd: NativeAd) {
         // The native ad will cause the application to become inactive and
         // open a new application.
     }

package/src/ios/AMBPlugin.swift

@@ -22,7 +22,7 @@ class AMBPlugin: CDVPlugin {
 
         if let x = self.commandDelegate.settings["disableSDKCrashReporting".lowercased()] as? String,
            x == "true" {
-            GADMobileAds.sharedInstance().disableSDKCrashReporting()
+            MobileAds.shared.disableSDKCrashReporting()
         }
     }
 
@@ -58,8 +58,8 @@ class AMBPlugin: CDVPlugin {
 
     @objc func start(_ command: CDVInvokedUrlCommand) {
         let ctx = AMBContext(command)
-        GADMobileAds.sharedInstance().start(completionHandler: { _ in
-            ctx.resolve(["version": GADGetStringFromVersionNumber(GADMobileAds.sharedInstance().versionNumber)])
+        MobileAds.shared.start(completionHandler: { _ in
+            ctx.resolve(["version": string(MobileAds.shared.versionNumber)])
         })
     }
 
@@ -67,7 +67,7 @@ class AMBPlugin: CDVPlugin {
         let ctx = AMBContext(command)
 
         if let muted = ctx.opt0() as? Bool {
-            GADMobileAds.sharedInstance().applicationMuted = muted
+            MobileAds.shared.isApplicationMuted = muted
             ctx.resolve()
         } else {
             ctx.reject()
@@ -78,7 +78,7 @@ class AMBPlugin: CDVPlugin {
         let ctx = AMBContext(command)
 
         if let volume = ctx.opt0() as? Float {
-            GADMobileAds.sharedInstance().applicationVolume = volume
+            MobileAds.shared.applicationVolume = volume
             ctx.resolve()
         } else {
             ctx.reject()

package/src/ios/AMBRewarded.swift

@@ -1,7 +1,7 @@
 import GoogleMobileAds
 
-class AMBRewarded: AMBAdBase, GADFullScreenContentDelegate {
-    var mAd: GADRewardedAd?
+class AMBRewarded: AMBAdBase, FullScreenContentDelegate {
+    var mAd: RewardedAd?
 
     deinit {
         clear()
@@ -14,7 +14,7 @@ class AMBRewarded: AMBAdBase, GADFullScreenContentDelegate {
     override func load(_ ctx: AMBContext) {
         clear()
 
-        GADRewardedAd.load(withAdUnitID: adUnitId, request: adRequest, completionHandler: { ad, error in
+        RewardedAd.load(with: adUnitId, request: adRequest, completionHandler: { ad, error in
             if error != nil {
                 self.emit(AMBEvents.adLoadFail, error!)
                 self.emit(AMBEvents.rewardedLoadFail, error!)
@@ -25,7 +25,7 @@ class AMBRewarded: AMBAdBase, GADFullScreenContentDelegate {
 
             self.mAd = ad
             ad?.fullScreenContentDelegate = self
-            ad?.serverSideVerificationOptions = ctx.optGADServerSideVerificationOptions()
+            ad?.serverSideVerificationOptions = ctx.optServerSideVerificationOptions()
 
             self.emit(AMBEvents.adLoad)
             self.emit(AMBEvents.rewardedLoad)
@@ -35,7 +35,7 @@ class AMBRewarded: AMBAdBase, GADFullScreenContentDelegate {
     }
 
     override func show(_ ctx: AMBContext) {
-        mAd?.present(fromRootViewController: plugin.viewController, userDidEarnRewardHandler: {
+        mAd?.present(from: plugin.viewController, userDidEarnRewardHandler: {
             let reward = self.mAd!.adReward
             self.emit(AMBEvents.adReward, reward)
             self.emit(AMBEvents.rewardedReward, reward)
@@ -43,23 +43,23 @@ class AMBRewarded: AMBAdBase, GADFullScreenContentDelegate {
         ctx.resolve()
     }
 
-    func adDidRecordImpression(_ ad: GADFullScreenPresentingAd) {
+    func adDidRecordImpression(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adImpression)
         self.emit(AMBEvents.rewardedImpression)
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         clear()
         self.emit(AMBEvents.adShowFail, error)
         self.emit(AMBEvents.rewardedShowFail, error)
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adShow)
         self.emit(AMBEvents.rewardedShow)
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         clear()
         self.emit(AMBEvents.adDismiss)
         self.emit(AMBEvents.rewardedDismiss)

package/src/ios/AMBRewardedInterstitial.swift

@@ -1,7 +1,7 @@
 import GoogleMobileAds
 
-class AMBRewardedInterstitial: AMBAdBase, GADFullScreenContentDelegate {
-    var mAd: GADRewardedInterstitialAd?
+class AMBRewardedInterstitial: AMBAdBase, FullScreenContentDelegate {
+    var mAd: RewardedInterstitialAd?
 
     deinit {
         clear()
@@ -14,7 +14,7 @@ class AMBRewardedInterstitial: AMBAdBase, GADFullScreenContentDelegate {
     override func load(_ ctx: AMBContext) {
         clear()
 
-        GADRewardedInterstitialAd.load(withAdUnitID: adUnitId, request: adRequest, completionHandler: { ad, error in
+        RewardedInterstitialAd.load(with: adUnitId, request: adRequest, completionHandler: { ad, error in
             if error != nil {
                 self.emit(AMBEvents.adLoadFail, error!)
                 self.emit(AMBEvents.rewardedInterstitialLoadFail, error!)
@@ -25,7 +25,7 @@ class AMBRewardedInterstitial: AMBAdBase, GADFullScreenContentDelegate {
 
             self.mAd = ad
             ad?.fullScreenContentDelegate = self
-            ad?.serverSideVerificationOptions = ctx.optGADServerSideVerificationOptions()
+            ad?.serverSideVerificationOptions = ctx.optServerSideVerificationOptions()
 
             self.emit(AMBEvents.adLoad)
             self.emit(AMBEvents.rewardedInterstitialLoad)
@@ -35,7 +35,7 @@ class AMBRewardedInterstitial: AMBAdBase, GADFullScreenContentDelegate {
     }
 
     override func show(_ ctx: AMBContext) {
-        mAd?.present(fromRootViewController: plugin.viewController, userDidEarnRewardHandler: {
+        mAd?.present(from: plugin.viewController, userDidEarnRewardHandler: {
             let reward = self.mAd!.adReward
             self.emit(AMBEvents.adReward, reward)
             self.emit(AMBEvents.rewardedInterstitialReward, reward)
@@ -43,23 +43,23 @@ class AMBRewardedInterstitial: AMBAdBase, GADFullScreenContentDelegate {
         ctx.resolve()
     }
 
-    func adDidRecordImpression(_ ad: GADFullScreenPresentingAd) {
+    func adDidRecordImpression(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adImpression)
         self.emit(AMBEvents.rewardedInterstitialImpression)
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         clear()
         self.emit(AMBEvents.adShowFail, error)
         self.emit(AMBEvents.rewardedInterstitialShowFail, error)
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adShow)
         self.emit(AMBEvents.rewardedInterstitialShow)
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         clear()
         self.emit(AMBEvents.adDismiss)
         self.emit(AMBEvents.rewardedInterstitialDismiss)