@ququplay/admob 7.0.3 → 7.2.1

package/ios/Sources/AdMobPlugin/AdMobPlugin.swift

@@ -13,6 +13,7 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "initialize", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "trackingAuthorizationStatus", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "requestConsentInfo", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "showPrivacyOptionsForm", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "requestTrackingAuthorization", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "showConsentForm", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "resetConsentInfo", returnType: CAPPluginReturnPromise),
@@ -25,7 +26,9 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "prepareInterstitial", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "showInterstitial", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "prepareRewardVideoAd", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "showRewardVideoAd", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "showRewardVideoAd", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "prepareRewardInterstitialAd", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "showRewardInterstitialAd", returnType: CAPPluginReturnPromise)
     ]
 
     var testingDevices: [String] = []
@@ -49,7 +52,7 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
         self.consentExecutor.plugin = self
         self.setRequestConfiguration(call)
 
-        GADMobileAds.sharedInstance().start(completionHandler: nil)
+        MobileAds.shared.start(completionHandler: nil)
         call.resolve([:])
     }
 
@@ -72,7 +75,7 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func setApplicationMuted(_ call: CAPPluginCall) {
         if let shouldMute = call.getBool("muted") {
-            GADMobileAds.sharedInstance().applicationMuted = shouldMute
+            MobileAds.shared.isApplicationMuted = shouldMute
             call.resolve([:])
         } else {
             call.reject("muted property cannot be null")
@@ -85,7 +88,7 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
             // Clamp volumes.
             if volume < 0.0 {volume = 0.0} else if volume > 1.0 {volume = 1.0}
 
-            GADMobileAds.sharedInstance().applicationVolume = volume
+            MobileAds.shared.applicationVolume = volume
 
             call.resolve([:])
         } else {
@@ -237,6 +240,12 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    @objc func showPrivacyOptionsForm(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            self.consentExecutor.showPrivacyOptionsForm(call)
+        }
+    }
+
     @objc func resetConsentInfo(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
             self.consentExecutor.resetConsentInfo(call)
@@ -252,11 +261,11 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
         return adUnitID
     }
 
-    private func GADRequestWithOption(_ npa: Bool) -> GADRequest {
-        let request = GADRequest()
+    private func GADRequestWithOption(_ npa: Bool) -> Request {
+        let request = Request()
 
         if npa {
-            let extras = GADExtras()
+            let extras = Extras()
             extras.additionalParameters = ["npa": "1"]
             request.register(extras)
         }
@@ -270,30 +279,30 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
     private func setRequestConfiguration(_ call: CAPPluginCall) {
 
         if call.getBool("initializeForTesting") ?? false {
-            GADMobileAds.sharedInstance().requestConfiguration.testDeviceIdentifiers = call.getArray("testingDevices", String.self) ?? []
+            MobileAds.shared.requestConfiguration.testDeviceIdentifiers = call.getArray("testingDevices", String.self) ?? []
         }
 
         if call.getBool("tagForChildDirectedTreatment") == true {
-            GADMobileAds.sharedInstance().requestConfiguration.tagForChildDirectedTreatment = true
+            MobileAds.shared.requestConfiguration.tagForChildDirectedTreatment = true
         }
 
         if call.getBool("tagForUnderAgeOfConsent") == true {
-            GADMobileAds.sharedInstance().requestConfiguration.tagForUnderAgeOfConsent = true
+            MobileAds.shared.requestConfiguration.tagForUnderAgeOfConsent = true
         }
 
         if call.getString("maxAdContentRating") != nil {
             switch call.getString("maxAdContentRating") {
             case "General":
-                GADMobileAds.sharedInstance().requestConfiguration.maxAdContentRating =
+                MobileAds.shared.requestConfiguration.maxAdContentRating =
                     GADMaxAdContentRating.general
             case "ParentalGuidance":
-                GADMobileAds.sharedInstance().requestConfiguration.maxAdContentRating =
+                MobileAds.shared.requestConfiguration.maxAdContentRating =
                     GADMaxAdContentRating.parentalGuidance
             case "Teen":
-                GADMobileAds.sharedInstance().requestConfiguration.maxAdContentRating =
+                MobileAds.shared.requestConfiguration.maxAdContentRating =
                     GADMaxAdContentRating.teen
             case "MatureAudience":
-                GADMobileAds.sharedInstance().requestConfiguration.maxAdContentRating =
+                MobileAds.shared.requestConfiguration.maxAdContentRating =
                     GADMaxAdContentRating.matureAudience
             default:
                 print("maxAdContentRating can't find value")

package/ios/Sources/AdMobPlugin/Banner/BannerExecutor.swift

@@ -2,34 +2,36 @@ import Foundation
 import Capacitor
 import GoogleMobileAds
 
-class BannerExecutor: NSObject, GADBannerViewDelegate {
+class BannerExecutor: NSObject, BannerViewDelegate {
     weak var plugin: AdMobPlugin?
-    var bannerView: GADBannerView!
+    var bannerView: BannerView!
+    var adPosition: String = ""
+    var Margin: Int = 0
 
-    func showBanner(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
+    func showBanner(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
         if let rootViewController = plugin?.getRootVC() {
 
             let adSize = call.getString("adSize") ?? "ADAPTIVE_BANNER"
             let adPosition = call.getString("position") ?? "BOTTOM_CENTER"
             let adMargin = call.getInt("margin") ?? 0
 
-            var bannerSize: GADAdSize
+            var bannerSize: AdSize
 
             switch adSize {
             case "BANNER":
-                bannerSize = GADAdSizeBanner
+                bannerSize = AdSizeBanner
                 break
             case "LARGE_BANNER":
-                bannerSize = GADAdSizeLargeBanner
+                bannerSize = AdSizeLargeBanner
                 break
             case "FULL_BANNER":
-                bannerSize = GADAdSizeFullBanner
+                bannerSize = AdSizeFullBanner
                 break
             case "LEADERBOARD":
-                bannerSize = GADAdSizeLeaderboard
+                bannerSize = AdSizeLeaderboard
                 break
             case "MEDIUM_RECTANGLE":
-                bannerSize = GADAdSizeMediumRectangle
+                bannerSize = AdSizeMediumRectangle
                 break
             case "SMART_BANNER":
                 bannerSize = kGADAdSizeSmartBannerPortrait
@@ -38,18 +40,14 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
                 let frame = { () -> CGRect in
                     // Here safe area is taken into account, hence the view frame is used
                     // after the view has been laid out.
-                    if #available(iOS 11.0, *) {
-                        return rootViewController.view.frame.inset(by: rootViewController.view.safeAreaInsets)
-                    } else {
-                        return rootViewController.view.frame
-                    }
+                    return rootViewController.view.frame.inset(by: rootViewController.view.safeAreaInsets)
                 }()
                 let viewWidth = frame.size.width
-                bannerSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(viewWidth)
+                bannerSize = currentOrientationAnchoredAdaptiveBanner(width: viewWidth)
                 break
             }
 
-            self.bannerView = GADBannerView(adSize: bannerSize)
+            self.bannerView = BannerView(adSize: bannerSize)
             self.addBannerViewToView(self.bannerView, adPosition, adMargin)
             self.bannerView.translatesAutoresizingMaskIntoConstraints = false
             self.bannerView.adUnitID = adUnitID
@@ -107,21 +105,37 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
         call.resolve([:])
     }
 
-    private func addBannerViewToView(_ bannerView: GADBannerView, _ adPosition: String, _ Margin: Int) {
+    private func addBannerViewToView(_ bannerView: BannerView, _ adPosition: String, _ Margin: Int) {
         removeBannerViewToView()
+        bannerView.translatesAutoresizingMaskIntoConstraints = false
+        bannerView.tag = 2743243288699 // rand
+        self.Margin = Margin
+        self.adPosition = adPosition
+    }
+
+    private func removeBannerViewToView() {
         if let rootViewController = plugin?.getRootVC() {
+            if let subView = rootViewController.view.viewWithTag(2743243288699) {
+                bannerView.delegate = nil
+                NSLog("AdMob: find subView")
+                subView.removeFromSuperview()
+            }
+        }
+    }
 
-            bannerView.translatesAutoresizingMaskIntoConstraints = false
-            bannerView.tag = 2743243288699 // rand
+    /// Tells the delegate an ad request loaded an ad.
+    func bannerViewDidReceiveAd(_ bannerView: BannerView) {
+        NSLog("bannerViewDidReceiveAd")
+        if let rootViewController = plugin?.getRootVC() {
             rootViewController.view.addSubview(bannerView)
             rootViewController.view.addConstraints(
                 [NSLayoutConstraint(item: bannerView,
-                                    attribute: adPosition == "TOP_CENTER" ? .top : .bottom,
+                                    attribute: self.adPosition == "TOP_CENTER" ? .top : .bottom,
                                     relatedBy: .equal,
                                     toItem: rootViewController.view.safeAreaLayoutGuide,
-                                    attribute: adPosition == "TOP_CENTER" ? .top : .bottom,
+                                    attribute: self.adPosition == "TOP_CENTER" ? .top : .bottom,
                                     multiplier: 1,
-                                    constant: CGFloat(Int(Margin) * -1)),
+                                    constant: CGFloat(Int(self.Margin) * -1)),
                  NSLayoutConstraint(item: bannerView,
                                     attribute: .centerX,
                                     relatedBy: .equal,
@@ -130,32 +144,17 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
                                     multiplier: 1,
                                     constant: 0)
                 ])
-        }
-    }
+            self.plugin?.notifyListeners(BannerAdPluginEvents.SizeChanged.rawValue, data: [
+                "width": bannerView.frame.width,
+                "height": bannerView.frame.height
+            ])
+            self.plugin?.notifyListeners(BannerAdPluginEvents.Loaded.rawValue, data: [:])
 
-    private func removeBannerViewToView() {
-        if let rootViewController = plugin?.getRootVC() {
-            if let subView = rootViewController.view.viewWithTag(2743243288699) {
-                bannerView.delegate = nil
-                NSLog("AdMob: find subView")
-                subView.removeFromSuperview()
-            }
         }
     }
 
-    /// Tells the delegate an ad request loaded an ad.
-    func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
-        NSLog("bannerViewDidReceiveAd")
-
-        self.plugin?.notifyListeners(BannerAdPluginEvents.SizeChanged.rawValue, data: [
-            "width": bannerView.frame.width,
-            "height": bannerView.frame.height
-        ])
-        self.plugin?.notifyListeners(BannerAdPluginEvents.Loaded.rawValue, data: [:])
-    }
-
     /// Tells the delegate an ad request failed.
-    func bannerView(_ bannerView: GADBannerView,
+    func bannerView(_ bannerView: BannerView,
                     didFailToReceiveAdWithError error: Error) {
         NSLog("bannerView:didFailToReceiveAdWithError: \(error.localizedDescription)")
         self.removeBannerViewToView()
@@ -169,18 +168,18 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
         ])
     }
 
-    func bannerViewDidRecordImpression(_ bannerView: GADBannerView) {
+    func bannerViewDidRecordImpression(_ bannerView: BannerView) {
         self.plugin?.notifyListeners(BannerAdPluginEvents.AdImpression.rawValue, data: [:])
     }
 
     /// Tells the delegate that a full-screen view will be presented in response
     /// to the user clicking on an ad.
-    func bannerViewWillPresentScreen(_ bannerView: GADBannerView) {
+    func bannerViewWillPresentScreen(_ bannerView: BannerView) {
         self.plugin?.notifyListeners(BannerAdPluginEvents.Opened.rawValue, data: [:])
     }
 
     /// Tells the delegate that the full-screen view will be dismissed.
-    func bannerViewWillDismissScreen(_ bannerView: GADBannerView) {
+    func bannerViewWillDismissScreen(_ bannerView: BannerView) {
         self.plugin?.notifyListeners(BannerAdPluginEvents.Closed.rawValue, data: [:])
     }
 }

package/ios/Sources/AdMobPlugin/Consent/ConsentExecutor.swift

@@ -7,78 +7,88 @@ class ConsentExecutor: NSObject {
     weak var plugin: AdMobPlugin?
 
     func requestConsentInfo(_ call: CAPPluginCall, _ debugGeography: Int, _ testDeviceIdentifiers: [String], _ tagForUnderAgeOfConsent: Bool) {
-        let parameters = UMPRequestParameters()
-        let debugSettings = UMPDebugSettings()
+        let parameters = RequestParameters()
+        let debugSettings = DebugSettings()
 
-        debugSettings.geography = UMPDebugGeography(rawValue: debugGeography) ?? UMPDebugGeography.disabled
+        debugSettings.geography = DebugGeography(rawValue: debugGeography) ?? DebugGeography.disabled
         debugSettings.testDeviceIdentifiers = testDeviceIdentifiers
 
         parameters.debugSettings = debugSettings
-        parameters.tagForUnderAgeOfConsent = tagForUnderAgeOfConsent
+        parameters.isTaggedForUnderAgeOfConsent = tagForUnderAgeOfConsent
 
         // Request an update to the consent information.
-        UMPConsentInformation.sharedInstance.requestConsentInfoUpdate(
+        ConsentInformation.shared.requestConsentInfoUpdate(
             with: parameters,
             completionHandler: { error in
                 if error != nil {
                     call.reject("Request consent info failed")
                 } else {
-                    call.resolve([
-                        "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus),
-                        "isConsentFormAvailable": UMPConsentInformation.sharedInstance.formStatus == UMPFormStatus.available,
-                        "canShowAds": self.canShowAds(),
-                        "canShowPersonalizedAds": self.canShowPersonalizedAds(),
-                        "isConsentOutdated": self.isConsentOutdated()
-                    ])
+                    call.resolve(self.getConsentInfoDictionary())
                 }
             })
     }
 
+    @MainActor
+    func showPrivacyOptionsForm(_ call: CAPPluginCall) {
+        guard let rootViewController = plugin?.getRootVC() else {
+            return call.reject("No ViewController")
+        }
+
+        Task {
+            do {
+                try await ConsentForm.presentPrivacyOptionsForm(from: rootViewController)
+                call.resolve()
+            } catch {
+                call.reject("Failed to show privacy options form: \(error.localizedDescription)")
+            }
+        }
+    }
+
+    @MainActor
     func showConsentForm(_ call: CAPPluginCall) {
-        if let rootViewController = plugin?.getRootVC() {
-            let formStatus = UMPConsentInformation.sharedInstance.formStatus
-
-            if formStatus == UMPFormStatus.available {
-                UMPConsentForm.load(completionHandler: {form, loadError in
-                    if loadError != nil {
-                        call.reject(loadError?.localizedDescription ?? "Load consent form error")
-                        return
-                    }
-
-                    form?.present(from: rootViewController, completionHandler: { dismissError in
-                        if dismissError != nil {
-                            call.reject(dismissError?.localizedDescription ?? "Consent dismiss error")
-                            return
-                        }
-
-                        call.resolve([
-                            "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus),
-                            "canShowAds": self.canShowAds(),
-                            "canShowPersonalizedAds": self.canShowPersonalizedAds(),
-                            "isConsentOutdated": self.isConsentOutdated()
-                        ])
-                    })
-                })
-            } else {
-                call.reject("Consent Form not available")
+        guard let rootViewController = plugin?.getRootVC() else {
+            return call.reject("No ViewController")
+        }
+
+        guard ConsentInformation.shared.formStatus == FormStatus.available else {
+            return call.reject("Consent Form not available")
+        }
+
+        Task {
+            do {
+                let form = try await ConsentForm.load()
+                try await form.present(from: rootViewController)
+                call.resolve(getConsentInfoDictionary())
+            } catch {
+                call.reject("Request consent info failed")
             }
-        } else {
-            call.reject("No ViewController")
         }
     }
 
     func resetConsentInfo(_ call: CAPPluginCall) {
-        UMPConsentInformation.sharedInstance.reset()
+        ConsentInformation.shared.reset()
         call.resolve()
     }
 
-    func getConsentStatusString(_ consentStatus: UMPConsentStatus) -> String {
+    private func getConsentInfoDictionary() -> [String: Any] {
+        return [
+            "status": getConsentStatusString(ConsentInformation.shared.consentStatus),
+            "isConsentFormAvailable": ConsentInformation.shared.formStatus == FormStatus.available,
+            "canRequestAds": ConsentInformation.shared.canRequestAds,
+            "privacyOptionsRequirementStatus": getPrivacyOptionsRequirementStatus(ConsentInformation.shared.privacyOptionsRequirementStatus),
+            "canShowAds": canShowAds(),
+            "canShowPersonalizedAds": canShowPersonalizedAds(),
+            "isConsentOutdated": isConsentOutdated()
+        ]
+    }
+
+    func getConsentStatusString(_ consentStatus: ConsentStatus) -> String {
         switch consentStatus {
-        case UMPConsentStatus.required:
+        case ConsentStatus.required:
             return "REQUIRED"
-        case UMPConsentStatus.notRequired:
+        case ConsentStatus.notRequired:
             return "NOT_REQUIRED"
-        case UMPConsentStatus.obtained:
+        case ConsentStatus.obtained:
             return "OBTAINED"
         default:
             return "UNKNOWN"
@@ -185,4 +195,14 @@ class ConsentExecutor: NSObject {
 
         return false
     }
+    func getPrivacyOptionsRequirementStatus(_ requirementStatus: PrivacyOptionsRequirementStatus) -> String {
+        switch requirementStatus {
+        case PrivacyOptionsRequirementStatus.required:
+            return "REQUIRED"
+        case PrivacyOptionsRequirementStatus.notRequired:
+            return "NOT_REQUIRED"
+        default:
+            return "UNKNOWN"
+        }
+    }
 }

package/ios/Sources/AdMobPlugin/Interstitial/AdInterstitialExecutor.swift

@@ -2,13 +2,13 @@ import Foundation
 import Capacitor
 import GoogleMobileAds
 
-class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
+class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     weak var plugin: AdMobPlugin?
-    var interstitial: GADInterstitialAd!
+    var interstitial: InterstitialAd!
 
-    func prepareInterstitial(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
-        GADInterstitialAd.load(
-            withAdUnitID: adUnitID,
+    func prepareInterstitial(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
+        InterstitialAd.load(
+            with: adUnitID,
             request: request,
             completionHandler: { (ad, error) in
                 if let error = error {
@@ -36,7 +36,7 @@ class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
     func showInterstitial(_ call: CAPPluginCall) {
         if let rootViewController = plugin?.getRootVC() {
             if let ad = self.interstitial {
-                ad.present(fromRootViewController: rootViewController)
+                ad.present(from: rootViewController)
                 call.resolve([:])
             } else {
                 NSLog("Ad wasn't ready")
@@ -45,7 +45,7 @@ class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
         }
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         NSLog("InterstitialFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.FailedToShow.rawValue, data: [
             "code": 0,
@@ -53,12 +53,12 @@ class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
         ])
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         NSLog("InterstitialFullScreenDelegate Ad did present full screen content.")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.Showed.rawValue, data: [:])
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         NSLog("InterstitialFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.Dismissed.rawValue, data: [:])
     }

package/ios/Sources/AdMobPlugin/Rewarded/AdRewardExecutor.swift

@@ -2,13 +2,13 @@ import Foundation
 import Capacitor
 import GoogleMobileAds
 
-class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
+class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     weak var plugin: AdMobPlugin?
-    var rewardedAd: GADRewardedAd!
+    var rewardedAd: RewardedAd!
 
-    func prepareRewardVideoAd(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
-        GADRewardedAd.load(
-            withAdUnitID: adUnitID,
+    func prepareRewardVideoAd(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
+        RewardedAd.load(
+            with: adUnitID,
             request: request,
             completionHandler: { (ad, error) in
                 if let error = error {
@@ -24,11 +24,11 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
                 self.rewardedAd = ad
 
                 if let providedOptions = call.getObject("ssv") {
-                    let ssvOptions = GADServerSideVerificationOptions()
+                    let ssvOptions = ServerSideVerificationOptions()
 
                     if let customData = providedOptions["customData"] as? String {
                         NSLog("Sending Custom Data: \(customData) to SSV callback")
-                        ssvOptions.customRewardString = customData
+                        ssvOptions.customRewardText = customData
                     }
 
                     if let userId = providedOptions["userId"] as? String {
@@ -53,7 +53,7 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
     func showRewardVideoAd(_ call: CAPPluginCall) {
         if let rootViewController = plugin?.getRootVC() {
             if let ad = self.rewardedAd {
-                ad.present(fromRootViewController: rootViewController,
+                ad.present(from: rootViewController,
                            userDidEarnRewardHandler: {
                             let reward = ad.adReward
                             self.plugin?.notifyListeners(RewardAdPluginEvents.Rewarded.rawValue, data: ["type": reward.type, "amount": reward.amount])
@@ -66,7 +66,7 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
         }
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardAdPluginEvents.FailedToShow.rawValue, data: [
             "code": 0,
@@ -74,12 +74,12 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
         ])
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         NSLog("RewardFullScreenDelegate Ad did present full screen content.")
         self.plugin?.notifyListeners(RewardAdPluginEvents.Showed.rawValue, data: [:])
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(RewardAdPluginEvents.Dismissed.rawValue, data: [:])
     }

package/ios/Sources/AdMobPlugin/RewardedInterstitial/AdRewardInterstitialExecutor.swift

@@ -2,13 +2,13 @@ import Foundation
 import Capacitor
 import GoogleMobileAds
 
-class AdRewardInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
+class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     weak var plugin: AdMobPlugin?
-    var rewardedInterstitialAd: GADRewardedInterstitialAd!
+    var rewardedInterstitialAd: RewardedInterstitialAd!
 
-    func prepareRewardInterstitialAd(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
-        GADRewardedInterstitialAd.load(
-            withAdUnitID: adUnitID,
+    func prepareRewardInterstitialAd(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
+        RewardedInterstitialAd.load(
+            with: adUnitID,
             request: request,
             completionHandler: { (ad, error) in
                 if let error = error {
@@ -24,11 +24,11 @@ class AdRewardInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
                 self.rewardedInterstitialAd = ad
 
                 if let providedOptions = call.getObject("ssv") {
-                    let ssvOptions = GADServerSideVerificationOptions()
+                    let ssvOptions = ServerSideVerificationOptions()
 
                     if let customData = providedOptions["customData"] as? String {
                         NSLog("Sending Custom Data: \(customData) to SSV callback")
-                        ssvOptions.customRewardString = customData
+                        ssvOptions.customRewardText = customData
                     }
 
                     if let userId = providedOptions["userId"] as? String {
@@ -53,7 +53,7 @@ class AdRewardInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
     func showRewardInterstitialAd(_ call: CAPPluginCall) {
         if let rootViewController = plugin?.getRootVC() {
             if let ad = self.rewardedInterstitialAd {
-                ad.present(fromRootViewController: rootViewController,
+                ad.present(from: rootViewController,
                            userDidEarnRewardHandler: {
                             let reward = ad.adReward
                             self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Rewarded.rawValue, data: ["type": reward.type, "amount": reward.amount])
@@ -66,7 +66,7 @@ class AdRewardInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
         }
     }
 
-    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+    func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.FailedToShow.rawValue, data: [
             "code": 0,
@@ -74,12 +74,12 @@ class AdRewardInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
         ])
     }
 
-    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         NSLog("RewardFullScreenDelegate Ad did present full screen content.")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Showed.rawValue, data: [:])
     }
 
-    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+    func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Dismissed.rawValue, data: [:])
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ququplay/admob",
-  "version": "7.0.3",
+  "version": "7.2.1",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -49,7 +49,6 @@
     "@capacitor/android": "^7.0.0",
     "@capacitor/cli": "^7.0.0",
     "@capacitor/core": "^7.0.0",
-    "@capacitor/docgen": "github:rdlabo/capacitor-docgen#feat/support_extends_build",
     "@capacitor/ios": "^7.0.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
@@ -68,7 +67,8 @@
     "typescript": "~4.1.5"
   },
   "dependencies": {
-    "@capacitor/core": "^7.0.0"
+    "@capacitor/core": "^7.0.0",
+    "@rdlabo/capacitor-docgen": "^0.4.1"
   },
   "lint-staged": {
     "*.{ts}": [

package/android/src/main/res/layout/bridge_layout_main.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.getcapacitor.BridgeActivity"
-    >
-
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>