@capacitor-community/admob 8.2.0-beta.pr483.shac8cc94ca69ee → 8.2.0-beta.pr484.shaa6be63853bbd

package/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', '13.6.0'
+  s.dependency 'Google-Mobile-Ads-SDK', '13.11.0'
   s.dependency 'GoogleUserMessagingPlatform', '~> 3.1'
 end

package/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
-        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", exact: "13.6.0"),
+        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", exact: "13.11.0"),
         .package(url: "https://github.com/googleads/swift-package-manager-google-user-messaging-platform.git", .upToNextMinor(from: "3.1.0"))
     ],
     targets: [

package/README.md

@@ -67,7 +67,7 @@ If you still use Capacitor 7, install `@capacitor-community/admob@7`.
 
 ### Google Mobile Ads SDK versions
 
-This major version pins Google Mobile Ads SDK **25.4.x** on Android and **13.6.0** on iOS (Swift Package Manager and CocoaPods). Leave those versions unless you have a specific need. Google's [Next-Gen SDK for Android](https://developers.google.com/admob/android/next-gen) waits until the next plugin major. See [Migration](https://docs.rdlabo.dev/projects/capacitor-admob/docs/migration) for the policy behind the pins.
+This major version pins Google Mobile Ads SDK **25.4.x** on Android and **13.11.0** on iOS (Swift Package Manager and CocoaPods). Leave those versions unless you have a specific need. Google's [Next-Gen SDK for Android](https://developers.google.com/admob/android/next-gen) waits until the next plugin major. See [Migration](https://docs.rdlabo.dev/projects/capacitor-admob/docs/migration) for the policy behind the pins.
 
 ### Android configuration
 

package/docs/migration.md

@@ -46,7 +46,9 @@ This major version keeps Google Mobile Ads SDK APIs that are deprecated but stil
 
 Google's [Next-Gen SDK for Android](https://developers.google.com/admob/android/next-gen) also waits for the next major: it changes SDK initialization, ad requests, and mediation.
 
-Pinned versions: Android 25.4.x, iOS 13.6.0 (Swift Package Manager and CocoaPods). CocoaPods support is planned to be removed in the next major.
+Pinned versions: Android 25.4.x, iOS 13.11.0 (Swift Package Manager and CocoaPods). CocoaPods support is planned to be removed in the next major.
+
+Android remains on 25.4.x because [SDK 25.5.0 raises the minimum Android API level](https://developers.google.com/admob/android/rel-notes). The iOS update from 13.6.0 to 13.11.0 keeps the plugin's existing platform and toolchain requirements; no public plugin API changes are required.
 
 ## Breaking changes from earlier versions
 

package/ios/Sources/AdMobPlugin/AdMobPlugin.swift

@@ -69,6 +69,36 @@ public class AdMobPlugin: CAPPlugin, CAPBridgedPlugin {
         self.consentExecutor.plugin = self
     }
 
+    /// Full-screen ads that currently have web media suspended.
+    private var webMediaSuspenders = Set<ObjectIdentifier>()
+
+    /// Pauses all web media while a full-screen ad is up, so WebKit releases its audio before the ad plays
+    /// and sets it up again afterwards, instead of leaving web audio silent until the app restarts.
+    func suspendWebMedia(for owner: AnyObject) {
+        Task { @MainActor [weak self] in
+            guard let self, self.webMediaSuspenders.insert(ObjectIdentifier(owner)).inserted,
+                self.webMediaSuspenders.count == 1
+            else { return }
+            self.setWebMediaPlaybackSuspended(true)
+        }
+    }
+
+    /// Only resumes once every ad that suspended has resumed, so a failed present (which can arrive
+    /// without a preceding adWillPresentFullScreenContent) can't release another ad's suspension.
+    func resumeWebMedia(for owner: AnyObject) {
+        Task { @MainActor [weak self] in
+            guard let self, self.webMediaSuspenders.remove(ObjectIdentifier(owner)) != nil,
+                self.webMediaSuspenders.isEmpty
+            else { return }
+            self.setWebMediaPlaybackSuspended(false)
+        }
+    }
+
+    @MainActor
+    func setWebMediaPlaybackSuspended(_ suspended: Bool) {
+        self.bridge?.webView?.setAllMediaPlaybackSuspended(suspended, completionHandler: nil)
+    }
+
     /**
      * Enable SKAdNetwork to track conversions
      * https://developers.google.com/admob/ios/ios14

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

@@ -73,6 +73,7 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        self.plugin?.resumeWebMedia(for: ad)
         removeCurrentlyShowingAd()
         NSLog("InterstitialFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.FailedToShow.rawValue, data: [
@@ -82,11 +83,13 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
+        self.plugin?.suspendWebMedia(for: ad)
         NSLog("InterstitialFullScreenDelegate Ad did present full screen content.")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.Showed.rawValue, data: [:])
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
+        self.plugin?.resumeWebMedia(for: ad)
         removeCurrentlyShowingAd()
         NSLog("InterstitialFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.Dismissed.rawValue, data: [:])

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

@@ -97,6 +97,7 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        self.plugin?.resumeWebMedia(for: ad)
         removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardAdPluginEvents.FailedToShow.rawValue, data: [
@@ -106,6 +107,7 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
+        self.plugin?.suspendWebMedia(for: ad)
         NSLog("RewardFullScreenDelegate Ad did present full screen content.")
         self.plugin?.notifyListeners(RewardAdPluginEvents.Showed.rawValue, data: [:])
     }
@@ -115,6 +117,7 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
+        self.plugin?.resumeWebMedia(for: ad)
         removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(RewardAdPluginEvents.Dismissed.rawValue, data: [:])

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

@@ -97,6 +97,7 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        self.plugin?.resumeWebMedia(for: ad)
         removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.FailedToShow.rawValue, data: [
@@ -106,11 +107,13 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
+        self.plugin?.suspendWebMedia(for: ad)
         NSLog("RewardFullScreenDelegate Ad did present full screen content.")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Showed.rawValue, data: [:])
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
+        self.plugin?.resumeWebMedia(for: ad)
         removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Dismissed.rawValue, data: [:])

package/ios/Tests/AdMobPluginTests/AdMobPluginTests.swift

@@ -1,15 +1,50 @@
 import XCTest
 @testable import AdMobPlugin
 
-class AdMobTests: XCTestCase {
-    func testEcho() {
-        // This is an example of a functional test case for a plugin.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-
-        //         let implementation = AdMob()
-        //         let value = "Hello, World!"
-        //         let result = implementation.echo(value)
-        //
-        //         XCTAssertEqual(value, result)
+final class AdMobPluginTests: XCTestCase {
+    @MainActor
+    func testNormalSuspensionAndResume() async {
+        await checkSuspensions([(0, true, true), (0, false, false)])
+    }
+
+    @MainActor
+    func testFailedAdCannotReleaseAnotherAdsSuspension() async {
+        await checkSuspensions([(0, true, true), (1, false, nil), (0, false, false)])
+    }
+
+    @MainActor
+    func testOnlyLastAdResumesMedia() async {
+        await checkSuspensions([(0, true, true), (1, true, nil), (0, false, nil), (1, false, false)])
+    }
+
+    @MainActor
+    private func checkSuspensions(_ steps: [(Int, Bool, Bool?)]) async {
+        let plugin = MediaTestPlugin()
+        let owners = [NSObject(), NSObject()]
+
+        for (owner, suspend, expected) in steps {
+            let called = expectation(description: "WebKit suspension: \(String(describing: expected))")
+            called.isInverted = expected == nil
+            plugin.onSuspension = { actual in
+                XCTAssertEqual(actual, expected)
+                called.fulfill()
+            }
+            if suspend {
+                plugin.suspendWebMedia(for: owners[owner])
+            } else {
+                plugin.resumeWebMedia(for: owners[owner])
+            }
+            await fulfillment(of: [called], timeout: expected == nil ? 0.1 : 2)
+        }
+        plugin.onSuspension = nil
+    }
+}
+
+private final class MediaTestPlugin: AdMobPlugin {
+    var onSuspension: ((Bool) -> Void)?
+
+    @MainActor
+    override func setWebMediaPlaybackSuspended(_ suspended: Bool) {
+        onSuspension?(suspended)
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capacitor-community/admob",
   "private": false,
-  "version": "8.2.0-beta.pr483.shac8cc94ca69ee",
+  "version": "8.2.0-beta.pr484.shaa6be63853bbd",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -33,6 +33,7 @@
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
     "verify:ios": "xcodebuild -scheme CapacitorCommunityAdmob -destination generic/platform=iOS",
+    "test:ios": "xcodebuild test -scheme CapacitorCommunityAdmob",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",