@capacitor-community/admob 3.3.0-0 → 4.0.0-1

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.12'
+  s.dependency 'Google-Mobile-Ads-SDK', '9.7.0'
 end

package/README.md

@@ -43,6 +43,15 @@ Made with [contributors-img](https://contrib.rocks).
 
 ## Installation
 
+If you use capacitor 4:
+
+```
+% npm install --save @capacitor-community/admob@next
+% npx cap update
+```
+
+capacitor 3:
+
 ```
 % npm install --save @capacitor-community/admob
 % npx cap update
@@ -53,6 +62,8 @@ Made with [contributors-img](https://contrib.rocks).
 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) {

package/android/build.gradle

@@ -1,18 +1,18 @@
 ext {
-    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.1'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.2.0'
-    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.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"
     }
 }
@@ -21,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"
@@ -39,15 +39,15 @@ 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.4.0"
@@ -72,7 +72,7 @@ dependencies {
     //    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
 
 	// after 20.5.0, require minCompileSdk (31)
-    implementation 'com.google.android.gms:play-services-ads:20.4.0'
+    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.6.0"

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/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

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.3.0-0",
+  "version": "4.0.0-1",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -40,10 +40,11 @@
     "release": "np --no-tests"
   },
   "devDependencies": {
-    "@capacitor/android": "^3.0.0",
-    "@capacitor/cli": "^3.0.0",
+    "@capacitor/android": "^4.0.0",
+    "@capacitor/core": "^4.0.0",
+    "@capacitor/cli": "^4.0.0",
     "@capacitor/docgen": "git+https://github.com/rdlabo/capacitor-docgen.git#feat/support_extends_build",
-    "@capacitor/ios": "^3.0.0",
+    "@capacitor/ios": "^4.0.0",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -52,15 +53,15 @@
     "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"
+    "@capacitor/core": "^4.0.0"
   },
   "husky": {
     "hooks": {