@ququplay/admob 5.3.2 → 7.0.1

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

@@ -0,0 +1,86 @@
+import Foundation
+import Capacitor
+import GoogleMobileAds
+
+class AdRewardInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
+    weak var plugin: AdMobPlugin?
+    var rewardedInterstitialAd: GADRewardedInterstitialAd!
+
+    func prepareRewardInterstitialAd(_ call: CAPPluginCall, _ request: GADRequest, _ adUnitID: String) {
+        GADRewardedInterstitialAd.load(
+            withAdUnitID: adUnitID,
+            request: request,
+            completionHandler: { (ad, error) in
+                if let error = error {
+                    NSLog("Rewarded ad failed to load with error: \(error.localizedDescription)")
+                    self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.FailedToLoad.rawValue, data: [
+                        "code": 0,
+                        "message": error.localizedDescription
+                    ])
+                    call.reject("Loading failed")
+                    return
+                }
+
+                self.rewardedInterstitialAd = ad
+
+                if let providedOptions = call.getObject("ssv") {
+                    let ssvOptions = GADServerSideVerificationOptions()
+
+                    if let customData = providedOptions["customData"] as? String {
+                        NSLog("Sending Custom Data: \(customData) to SSV callback")
+                        ssvOptions.customRewardString = customData
+                    }
+
+                    if let userId = providedOptions["userId"] as? String {
+                        NSLog("Sending UserId: \(userId) to SSV callback")
+                        ssvOptions.userIdentifier = userId
+                    }
+
+                    self.rewardedInterstitialAd?.serverSideVerificationOptions = ssvOptions
+                }
+
+                self.rewardedInterstitialAd?.fullScreenContentDelegate = self
+                self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Loaded.rawValue, data: [
+                    "adUnitId": adUnitID
+                ])
+                call.resolve([
+                    "adUnitId": adUnitID
+                ])
+            }
+        )
+    }
+
+    func showRewardInterstitialAd(_ call: CAPPluginCall) {
+        if let rootViewController = plugin?.getRootVC() {
+            if let ad = self.rewardedInterstitialAd {
+                ad.present(fromRootViewController: rootViewController,
+                           userDidEarnRewardHandler: {
+                            let reward = ad.adReward
+                            self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Rewarded.rawValue, data: ["type": reward.type, "amount": reward.amount])
+                            call.resolve(["type": reward.type, "amount": reward.amount])
+                           }
+                )
+            } else {
+                call.reject("Reward Video is Not Ready Yet")
+            }
+        }
+    }
+
+    func ad(_ ad: GADFullScreenPresentingAd, 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,
+            "message": error.localizedDescription
+        ])
+    }
+
+    func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+        NSLog("RewardFullScreenDelegate Ad did present full screen content.")
+        self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Showed.rawValue, data: [:])
+    }
+
+    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+        NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
+        self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Dismissed.rawValue, data: [:])
+    }
+}

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

@@ -0,0 +1,8 @@
+public enum RewardInterstitialAdPluginEvents: String {
+    case Loaded = "onRewardedInterstitialAdLoaded"
+    case FailedToLoad = "onRewardedInterstitialAdFailedToLoad"
+    case Showed = "onRewardedInterstitialAdShowed"
+    case FailedToShow = "onRewardedInterstitialAdFailedToShow"
+    case Dismissed = "onRewardedInterstitialAdDismissed"
+    case Rewarded = "onRewardedInterstitialAdReward"
+}

package/ios/Tests/AdMobPluginTests/AdMobPluginTests.swift

@@ -0,0 +1,15 @@
+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)
+    }
+}

package/package.json

@@ -1,20 +1,22 @@
 {
   "name": "@ququplay/admob",
-  "version": "5.3.2",
+  "version": "7.0.1",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
   "unpkg": "dist/plugin.js",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "android/src/main/",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
-    "QuquplayAdmob.podspec"
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
+    "CapacitorCommunityAdmob.podspec"
   ],
   "author": "Masahiko Sakakibara <sakakibara@rdlabo.jp>",
   "license": "MIT",
@@ -27,49 +29,46 @@
   },
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin -sdk iphoneos && cd ..",
+    "verify:ios": "xcodebuild -scheme CapacitorCommunityAdmob -destination generic/platform=iOS",
     "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",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- autocorrect --format",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "eslint": "eslint src/. --ext ts",
-    "prettier": "prettier \"{src/*.ts,**/*.java}\"",
+    "prettier": "prettier \"{src/*.ts,**/*.java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api AdMobPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
     "prepublishOnly": "npm run build",
-    "release": "np --no-tests"
+    "release": "np --no-tests --any-branch",
+    "prepare": "husky"
   },
   "devDependencies": {
-    "@capacitor/android": "5.0.0",
-    "@capacitor/cli": "5.0.0",
-    "@capacitor/core": "5.0.0",
-    "@capacitor/docgen": "git+https://github.com/rdlabo/capacitor-docgen.git#feat/support_extends_build",
-    "@capacitor/ios": "next",
-    "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^1.0.1",
-    "@ionic/swiftlint-config": "^1.1.2",
-    "eslint": "^7.11.0",
-    "husky": "^4.3.8",
-    "lint-staged": "^11.0.0",
+    "@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",
+    "@ionic/swiftlint-config": "^2.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "eslint": "^8.57.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^15.2.10",
     "np": "^8.0.4",
     "pre-commit": "^1.2.2",
-    "prettier": "~2.3.0",
-    "prettier-plugin-java": "~1.0.2",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.32.0",
-    "swiftlint": "^1.0.1",
+    "prettier": "^3.4.2",
+    "prettier-plugin-java": "^2.6.6",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.30.1",
+    "swiftlint": "^2.0.0",
     "typescript": "~4.1.5"
   },
   "dependencies": {
-    "@capacitor/core": "next"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "@capacitor/core": "^7.0.0"
   },
   "lint-staged": {
     "*.{ts}": [
@@ -79,13 +78,10 @@
     "*.{java}": [
       "npm run prettier -- --write",
       "git add"
-    ],
-    "*.swift": [
-      "npm run swiftlint -- autocorrect --format",
-      "git add"
     ]
   },
   "prettier": "@ionic/prettier-config",
+  "swiftlint": "@ionic/swiftlint-config",
   "eslintConfig": {
     "extends": "@ionic/eslint-config/recommended"
   },

package/QuquplayAdmob.podspec

@@ -1,19 +0,0 @@
-require 'json'
-
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
-Pod::Spec.new do |s|
-  s.name = 'QuquplayAdmob'
-  s.version = package['version']
-  s.summary = package['description']
-  s.license = package['license']
-  s.homepage = package['repository']['url']
-  s.author = package['author']
-  s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target  = '13.0'
-  s.swift_version = '5.1'
-  s.static_framework = true
-  s.dependency 'Capacitor'
-  s.dependency 'Google-Mobile-Ads-SDK', '10.12.0'
-end

package/ios/Plugin/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

package/ios/Plugin/Plugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/Plugin.m

@@ -1,23 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(AdMob, "AdMob",
-           CAP_PLUGIN_METHOD(initialize, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(trackingAuthorizationStatus, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(requestConsentInfo, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(requestTrackingAuthorization, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(showConsentForm, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(resetConsentInfo, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setApplicationMuted, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setApplicationVolume, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(showBanner, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(resumeBanner, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(hideBanner, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(removeBanner, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(prepareInterstitial, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(showInterstitial, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(prepareRewardVideoAd, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(showRewardVideoAd, CAPPluginReturnPromise);
-)