feat(): update package version

Author: rdlabo

CapacitorCommunityAdmob.podspec

@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.swift_version = '5.1'
   s.static_framework = true
   s.dependency 'Capacitor'
-  s.dependency 'Google-Mobile-Ads-SDK', '11.3.0'
-  s.dependency 'GoogleUserMessagingPlatform', '>= 2.7.0', '< 3.0.0'
+  s.dependency 'Google-Mobile-Ads-SDK', '12.7.0'
+  s.dependency 'GoogleUserMessagingPlatform', '3.0.0'
 end

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
-        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", from: "11.3.0")
+        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", from: "12.7.0")
     ],
     targets: [
         .target(

android/build.gradle

@@ -4,12 +4,12 @@ ext {
     androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.2.0'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
-    playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '23.0.0'
+    playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '24.4.+'
     androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.13.0'
 }
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.25'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.1.0'
     repositories {
         google()
         mavenCentral()

demo/angular/ios/App/Podfile.lock

@@ -1,13 +1,14 @@
 PODS:
   - Capacitor (7.0.1):
     - CapacitorCordova
-  - CapacitorCommunityAdmob (7.0.0):
+  - CapacitorCommunityAdmob (7.0.3):
     - Capacitor
-    - Google-Mobile-Ads-SDK (= 11.3.0)
+    - Google-Mobile-Ads-SDK (= 12.7.0)
+    - GoogleUserMessagingPlatform (= 3.0.0)
   - CapacitorCordova (7.0.1)
-  - Google-Mobile-Ads-SDK (11.3.0):
+  - Google-Mobile-Ads-SDK (12.7.0):
     - GoogleUserMessagingPlatform (>= 1.1)
-  - GoogleUserMessagingPlatform (2.7.0)
+  - GoogleUserMessagingPlatform (3.0.0)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -28,12 +29,12 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/ios"
 
 SPEC CHECKSUMS:
-  Capacitor: 23fff43571a4d1e3ee7d67b5a3588c6e757c2913
-  CapacitorCommunityAdmob: 3a92f9967913e8d53aeaed8e4d1a3b5b51a6d228
+  Capacitor: de199cba6c8b20995428ad0b7cb0bc6ca625ffd4
+  CapacitorCommunityAdmob: a560e4f094932dd0f6cef05018e00615dfabeef6
   CapacitorCordova: 63d476958d5022d76f197031e8b7ea3519988c64
-  Google-Mobile-Ads-SDK: 301a16c461c331ba34ff4dab40a22ab7c147af61
-  GoogleUserMessagingPlatform: a8b56893477f67212fbc8411c139e61d463349f5
+  Google-Mobile-Ads-SDK: 90a3936b11fcb1a9a69b2a33fb608e793666ce73
+  GoogleUserMessagingPlatform: f8d0cdad3ca835406755d0a69aa634f00e76d576
 
 PODFILE CHECKSUM: cc932066d42cbba5a5dcf74773455d5ab18749f7
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

ios/Sources/AdMobPlugin/AdMobPlugin.swift

@@ -49,7 +49,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 +72,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 +85,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 {
@@ -252,11 +252,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 +270,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")

ios/Sources/AdMobPlugin/Banner/BannerExecutor.swift

@@ -2,34 +2,34 @@ import Foundation
 import Capacitor
 import GoogleMobileAds
 
-class BannerExecutor: NSObject, GADBannerViewDelegate {
+class BannerExecutor: NSObject, BannerViewDelegate {
     weak var plugin: AdMobPlugin?
-    var bannerView: GADBannerView!
+    var bannerView: BannerView!
 
-    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
@@ -45,11 +45,11 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
                     }
                 }()
                 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,7 +107,7 @@ 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()
         if let rootViewController = plugin?.getRootVC() {
 
@@ -144,7 +144,7 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
     }
 
     /// Tells the delegate an ad request loaded an ad.
-    func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
+    func bannerViewDidReceiveAd(_ bannerView: BannerView) {
         NSLog("bannerViewDidReceiveAd")
 
         self.plugin?.notifyListeners(BannerAdPluginEvents.SizeChanged.rawValue, data: [
@@ -155,7 +155,7 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
     }
 
     /// 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 +169,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: [:])
     }
 }

ios/Sources/AdMobPlugin/Consent/ConsentExecutor.swift

@@ -7,55 +7,55 @@ 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
+                        "status": self.getConsentStatusString(ConsentInformation.shared.consentStatus),
+                        "isConsentFormAvailable": ConsentInformation.shared.formStatus == FormStatus.available
                     ])
                 }
             })
     }
 
     func showConsentForm(_ call: CAPPluginCall) {
         if let rootViewController = plugin?.getRootVC() {
-            let formStatus = UMPConsentInformation.sharedInstance.formStatus
+            let formStatus = ConsentInformation.shared.formStatus
 
-            if formStatus == UMPFormStatus.available {
-                UMPConsentForm.load(completionHandler: {form, loadError in
+            if formStatus == FormStatus.available {
+                ConsentForm.load(with: {form, loadError in
                     if loadError != nil {
                         call.reject(loadError?.localizedDescription ?? "Load consent form error")
                         return
                     }
 
-                    if UMPConsentInformation.sharedInstance.consentStatus == UMPConsentStatus.required {
+                    if ConsentInformation.shared.consentStatus == ConsentStatus.required {
                         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)
+                                "status": self.getConsentStatusString(ConsentInformation.shared.consentStatus)
                             ])
                         })
                     } else {
                         call.resolve([
-                            "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus)
+                            "status": self.getConsentStatusString(ConsentInformation.shared.consentStatus)
                         ])
                     }
                 })
@@ -68,17 +68,17 @@ class ConsentExecutor: NSObject {
     }
 
     func resetConsentInfo(_ call: CAPPluginCall) {
-        UMPConsentInformation.sharedInstance.reset()
+        ConsentInformation.shared.reset()
         call.resolve()
     }
 
-    func getConsentStatusString(_ consentStatus: UMPConsentStatus) -> String {
+    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"