@capacitor-community/admob 3.2.0 → 4.0.0-0

package/CapacitorCommunityAdmob.podspec

@@ -11,9 +11,9 @@ Pod::Spec.new do |s|
   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  = '12.0'
+  s.ios.deployment_target  = '13.0'
   s.swift_version = '5.1'
   s.static_framework = true
   s.dependency 'Capacitor'
-  s.dependency 'Google-Mobile-Ads-SDK', '~> 8.0'
+  s.dependency 'Google-Mobile-Ads-SDK', '9.7.0'
 end

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) COPYRIGHT_YEAR COPYRIGHT_HOLDER
+Copyright (c) 2021 Capacitor Community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -6,15 +6,12 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/maintenance/yes/2021?style=flat-square" />
+  <img src="https://img.shields.io/maintenance/yes/2022?style=flat-square" />
   <!-- <a href="https://github.com/capacitor-community/example/actions?query=workflow%3A%22CI%22"><img src="https://img.shields.io/github/workflow/status/capacitor-community/example/CI?style=flat-square" /></a> -->
   <a href="https://www.npmjs.com/package/@capacitor-community/admob"><img src="https://img.shields.io/npm/l/@capacitor-community/admob?style=flat-square" /></a>
 <br>
   <a href="https://www.npmjs.com/package/@capacitor-community/admob"><img src="https://img.shields.io/npm/dw/@capacitor-community/admob?style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@capacitor-community/admob"><img src="https://img.shields.io/npm/v/@capacitor-community/admob?style=flat-square" /></a>
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-7-orange?style=flat-square" /></a>
-<!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
 ## Maintainers
@@ -26,6 +23,13 @@
 
 Maintenance Status: Actively Maintained
 
+## Contributors ✨
+<a href="https://github.com/capacitor-community/admob/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=capacitor-community/admob" />
+</a>
+
+Made with [contributors-img](https://contrib.rocks).
+
 ## Demo
 
 [Demo code is here.](https://github.com/capacitor-community/admob/tree/master/demo)
@@ -49,6 +53,8 @@ Maintenance Status: Actively Maintained
 In file `android/app/src/main/java/**/**/MainActivity.java`, add the plugin to the initialization list:
 
 ```java
+import android.os.Bundle;
+
 public class MainActivity extends BridgeActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -104,6 +110,21 @@ Don't forget to replace `[APP_ID]` by your AdMob application Id.
 import { AdMob } from '@capacitor-community/admob';
 
 export async function initialize(): Promise<void> {
+  const { status } = await AdMob.trackingAuthorizationStatus();
+
+  if (status === 'notDetermined') {
+    /**
+     * If you want to explain TrackingAuthorization before showing the iOS dialog,
+     * you can show the modal here.
+     * ex)
+     * const modal = await this.modalCtrl.create({
+     *   component: RequestTrackingPage,
+     * });
+     * await modal.present();
+     * await modal.onDidDismiss();  // Wait for close modal
+     **/
+  }
+ 
   AdMob.initialize({
     requestTrackingAuthorization: true,
     testingDevices: ['2077ef9a63d2b398840261c8221a0c9b'],
@@ -876,29 +897,3 @@ You should run `pod repo update` ;
 ## License
 
 Capacitor AdMob is [MIT licensed](./LICENSE).
-
-## Contributors ✨
-
-Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
-
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tr>
-    <td align="center"><a href="https://wako.app"><img src="https://avatars1.githubusercontent.com/u/216573?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jean-Baptiste Malatrasi</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=JumBay" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/gant02"><img src="https://avatars1.githubusercontent.com/u/6771123?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gant02</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=gant02" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.saninnsalas.com"><img src="https://avatars1.githubusercontent.com/u/5490201?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saninn Salas Diaz</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=distante" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.nicolueg.com"><img src="https://avatars.githubusercontent.com/u/48101693?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nico Lueg</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=NLueg" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/ghonche-yqr-21774b114/"><img src="https://avatars.githubusercontent.com/u/25591295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ghonche Yqr</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=ghonche-yqr" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/vanessag"><img src="https://avatars.githubusercontent.com/u/4007550?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vanessag</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=vanessag" title="Code">💻</a></td>
-    <td align="center"><a href="https://mattmilan.dev/"><img src="https://avatars.githubusercontent.com/u/49694881?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Milan</b></sub></a><br /><a href="https://github.com/capacitor-community/admob/commits?author=mattmilan-dev" title="Code">💻</a></td>
-  </tr>
-</table>
-
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

package/android/build.gradle

@@ -1,17 +1,18 @@
 ext {
-    junitVersion =  project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.12'
-    androidxJunitVersion =  project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.2'
-    androidxEspressoCoreVersion =  project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.3.0'
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
 }
 
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.5.21'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -20,10 +21,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,18 +39,18 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
 repositories {
     google()
-    jcenter()
-    mavenCentral()
+        mavenCentral()
+
 }
 
-def testRunner = "1.3.0"
+def testRunner = "1.4.0"
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -70,14 +71,15 @@ dependencies {
     //    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     //    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
 
-    implementation 'com.google.android.gms:play-services-ads:20.1.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+	// after 20.5.0, require minCompileSdk (31)
+    implementation 'com.google.android.gms:play-services-ads:21.1.0'
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 // Allow to run unit test with  ./gradlew test
 tasks.withType(Test) {
     useJUnitPlatform()
-}
+}

package/android/src/main/java/com/getcapacitor/community/admob/banner/BannerAdSizeInfo.kt

@@ -13,5 +13,5 @@ data class BannerAdSizeInfo(val width: Int, val height: Int) : JSObject() {
         super.put("width", width)
         super.put("height", height)
     }
-    constructor(mAdView: AdView): this(Objects.requireNonNull(mAdView.adSize).width, Objects.requireNonNull(mAdView.adSize).height)
+    constructor(mAdView: AdView): this(Objects.requireNonNull(mAdView.adSize)!!.width, Objects.requireNonNull(mAdView.adSize)!!.height)
 }

package/dist/plugin.js

@@ -235,5 +235,5 @@ var AdMobPlugin = (function (exports, core) {
 
     return exports;
 
-}({}, capacitorExports));
+})({}, capacitorExports);
 //# sourceMappingURL=plugin.js.map

package/ios/Plugin/Banner/BannerExecutor.swift

@@ -17,19 +17,19 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
 
             switch adSize {
             case "BANNER":
-                bannerSize = kGADAdSizeBanner
+                bannerSize = GADAdSizeBanner
                 break
             case "LARGE_BANNER":
-                bannerSize = kGADAdSizeLargeBanner
+                bannerSize = GADAdSizeLargeBanner
                 break
             case "FULL_BANNER":
-                bannerSize = kGADAdSizeFullBanner
+                bannerSize = GADAdSizeFullBanner
                 break
             case "LEADERBOARD":
-                bannerSize = kGADAdSizeLeaderboard
+                bannerSize = GADAdSizeLeaderboard
                 break
             case "MEDIUM_RECTANGLE":
-                bannerSize = kGADAdSizeMediumRectangle
+                bannerSize = GADAdSizeMediumRectangle
                 break
             case "SMART_BANNER":
                 bannerSize = kGADAdSizeSmartBannerPortrait
@@ -136,6 +136,7 @@ class BannerExecutor: NSObject, GADBannerViewDelegate {
     private func removeBannerViewToView() {
         if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
             if let subView = rootViewController.view.viewWithTag(2743243288699) {
+                bannerView.delegate = nil
                 NSLog("AdMob: find subView")
                 subView.removeFromSuperview()
             }

package/ios/Plugin/Interstitial/AdInterstitialExecutor.swift

@@ -43,11 +43,6 @@ class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
         }
     }
 
-    public func adDidPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
-        NSLog("InterstitialFullScreenDelegate Ad did present full screen content.")
-        self.plugin?.notifyListeners(InterstitialAdPluginEvents.Showed.rawValue, data: [:])
-    }
-
     public func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         NSLog("InterstitialFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.FailedToShow.rawValue, data: [
@@ -55,6 +50,11 @@ class AdInterstitialExecutor: NSObject, GADFullScreenContentDelegate {
             "message": error.localizedDescription
         ])
     }
+    
+    public func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+        NSLog("InterstitialFullScreenDelegate Ad did present full screen content.")
+        self.plugin?.notifyListeners(InterstitialAdPluginEvents.Showed.rawValue, data: [:])
+    }
 
     public func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
         NSLog("InterstitialFullScreenDelegate Ad did dismiss full screen content.")

package/ios/Plugin/Rewarded/AdRewardExecutor.swift

@@ -64,11 +64,6 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
         }
     }
 
-    public func adDidPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
-        NSLog("RewardFullScreenDelegate Ad did present full screen content.")
-        self.plugin?.notifyListeners(RewardAdPluginEvents.Showed.rawValue, data: [:])
-    }
-
     public func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardAdPluginEvents.FailedToShow.rawValue, data: [
@@ -76,6 +71,11 @@ class AdRewardExecutor: NSObject, GADFullScreenContentDelegate {
             "message": error.localizedDescription
         ])
     }
+    
+    public func adWillPresentFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+        NSLog("RewardFullScreenDelegate Ad did present full screen content.")
+        self.plugin?.notifyListeners(RewardAdPluginEvents.Showed.rawValue, data: [:])
+    }
 
     public func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/admob",
-  "version": "3.2.0",
+  "version": "4.0.0-0",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -37,7 +37,7 @@
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
     "prepublishOnly": "npm run build",
-    "release": "np"
+    "release": "np --no-tests"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
@@ -52,12 +52,12 @@
     "lint-staged": "^11.0.0",
     "np": "^7.4.0",
     "pre-commit": "^1.2.2",
-    "prettier": "~2.2.0",
-    "prettier-plugin-java": "~1.0.0",
+    "prettier": "~2.3.0",
+    "prettier-plugin-java": "~1.0.2",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "swiftlint": "^1.0.1",
-    "typescript": "~4.0.3"
+    "typescript": "~4.1.5"
   },
   "dependencies": {
     "@capacitor/core": "^3.0.0"
@@ -69,7 +69,6 @@
   },
   "lint-staged": {
     "*.{ts}": [
-      "npm run eslint -- --fix",
       "npm run prettier -- --write",
       "git add"
     ],