Merge pull request #37 from googleads/main

sync fork
SuaMusica · Jan 9, 2025 · 26de162 · 26de162
2 parents b77b8c8 + 406add0
commit 26de162
Show file tree

Hide file tree

Showing 191 changed files with 3,369 additions and 291 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
         - "samples/admob/rewarded_example"
         - "samples/admob/rewarded_interstitial_example"   
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -60,7 +60,7 @@ jobs:
         - "samples/admob/rewarded_example"
         - "samples/admob/rewarded_interstitial_example" 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0  
       - name: "Install Flutter"
@@ -92,7 +92,7 @@ jobs:
         - "samples/admob/rewarded_example"
         - "samples/admob/rewarded_interstitial_example" 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_applovin.yaml b/.github/workflows/gma_mediation_applovin.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -56,7 +56,7 @@ jobs:
       - uses: swift-actions/setup-swift@v2
         with:
           swift-version: "5.7.2"
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -82,7 +82,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_dtexchange.yaml b/.github/workflows/gma_mediation_dtexchange.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -56,7 +56,7 @@ jobs:
       - uses: swift-actions/setup-swift@v2
         with:
           swift-version: "5.7.2"
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -82,7 +82,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         fetch-depth: 0
     - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_inmobi.yaml b/.github/workflows/gma_mediation_inmobi.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         fetch-depth: 0
     - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_ironsource.yaml b/.github/workflows/gma_mediation_ironsource.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -55,7 +55,7 @@ jobs:
       - uses: swift-actions/setup-swift@v2
         with:
           swift-version: "5.7.2"
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -81,7 +81,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         fetch-depth: 0
     - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_liftoffmonetize.yaml b/.github/workflows/gma_mediation_liftoffmonetize.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -56,7 +56,7 @@ jobs:
       - uses: swift-actions/setup-swift@v2
         with:
           swift-version: "5.7.2"
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -83,7 +83,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_meta.yaml b/.github/workflows/gma_mediation_meta.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         fetch-depth: 0
     - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_mintegral.yaml b/.github/workflows/gma_mediation_mintegral.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         fetch-depth: 0
     - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_pangle.yaml b/.github/workflows/gma_mediation_pangle.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_unity.yaml b/.github/workflows/gma_mediation_unity.yaml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -53,7 +53,7 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 40
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -80,7 +80,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/google_mobile_ads.yaml b/.github/workflows/google_mobile_ads.yaml
@@ -34,7 +34,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -56,7 +56,7 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 40
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -83,7 +83,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/packages/google_mobile_ads/CHANGELOG.md b/packages/google_mobile_ads/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Next Version
+* Updated WebView Flutter Android dependency 
+
+## 5.2.0
+* Removed use of rootViewController for iOS GMA SDK which solved issues like 
+  https://github.com/googleads/googleads-mobile-flutter/issues/1146 and https://github.com/googleads/googleads-mobile-flutter/issues/700.
+* Android GMA SDK is now initialized on a background thread.
+* Updates GMA [iOS](https://developers.google.com/admob/ios/rel-notes) dependency to 11.10.0
+* Updates GMA [Android](https://developers.google.com/admob/android/rel-notes) dependency to 23.4.0
+
 ## 5.1.0
 * Adds support for APIs from the [Android](https://developers.google.com/admob/android/privacy/release-notes) UMP SDK version 2.2.0.
 * Adds support for APIs from the [iOS](https://developers.google.com/admob/ios/privacy/download#release_notes) UMP SDK version 2.4.0.

diff --git a/packages/google_mobile_ads/android/build.gradle b/packages/google_mobile_ads/android/build.gradle
@@ -35,8 +35,8 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.android.gms:play-services-ads:23.0.0'
-        implementation 'com.google.android.ump:user-messaging-platform:2.2.0'
+        api 'com.google.android.gms:play-services-ads:23.4.0'
+        implementation 'com.google.android.ump:user-messaging-platform:3.0.0'
         implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
         implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
         implementation 'com.google.errorprone:error_prone_annotations:2.16'

diff --git a/...google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/Constants.java b/...google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/Constants.java
@@ -17,7 +17,7 @@
 /** Constants used in the plugin. */
 public class Constants {
   /** Version request agent. Should be bumped alongside plugin versions. */
-  public static final String REQUEST_AGENT_PREFIX_VERSIONED = "Flutter-GMA-5.1.0";
+  public static final String REQUEST_AGENT_PREFIX_VERSIONED = "Flutter-GMA-5.2.0";
   /** Prefix for news template */
   public static final String REQUEST_AGENT_NEWS_TEMPLATE_PREFIX = "News";
 

diff --git a/...ads/android/src/main/java/io/flutter/plugins/googlemobileads/FlutterMobileAdsWrapper.java b/...ads/android/src/main/java/io/flutter/plugins/googlemobileads/FlutterMobileAdsWrapper.java
@@ -36,7 +36,14 @@ public FlutterMobileAdsWrapper() {}
   /** Initializes the sdk. */
   public void initialize(
       @NonNull Context context, @NonNull OnInitializationCompleteListener listener) {
-    MobileAds.initialize(context, listener);
+    new Thread(
+            new Runnable() {
+              @Override
+              public void run() {
+                MobileAds.initialize(context, listener);
+              }
+            })
+        .start();
   }
 
   /** Wrapper for setAppMuted. */

diff --git a/packages/google_mobile_ads/example/ios/Podfile b/packages/google_mobile_ads/example/ios/Podfile
@@ -36,7 +36,7 @@ target 'Runner' do
     inherit! :search_paths
 
     # Matches test_spec dependency.
-    pod 'OCMock', '3.6'
+    pod 'OCMock', '3.9.3'
   end
 end
 

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTAppOpenAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTAppOpenAdTest.m
@@ -56,13 +56,9 @@ - (void)testLoadShowGAMRequest {
 // Helper method for testing with FLTAdRequest and FLTGAMAdRequest.
 - (void)testLoadShowAppOpenAd:(FLTAdRequest *)request
               gadOrGAMRequest:(GADRequest *)gadOrGAMRequest {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTAppOpenAd *ad =
-      [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
-                                     request:request
-                          rootViewController:mockRootViewController
-                                        adId:@1];
+  FLTAppOpenAd *ad = [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
+                                                    request:request
+                                                       adId:@1];
   ad.manager = mockManager;
 
   // Stub the load call to invoke successful load callback.
@@ -130,8 +126,7 @@ - (void)testLoadShowAppOpenAd:(FLTAdRequest *)request
 
   [ad show];
 
-  OCMVerify([appOpenClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]]);
+  OCMVerify([appOpenClassMock presentFromRootViewController:[OCMArg isNil]]);
 
   // Verify full screen callbacks.
   OCMVerify([mockManager adWillPresentFullScreenContent:[OCMArg isEqual:ad]]);
@@ -162,13 +157,9 @@ - (void)testFailedToLoadGAMRequest {
 
 // Helper for testing failed to load.
 - (void)testFailedToLoad:(FLTAdRequest *)request {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTAppOpenAd *ad =
-      [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
-                                     request:request
-                          rootViewController:mockRootViewController
-                                        adId:@1];
+  FLTAppOpenAd *ad = [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
+                                                    request:request
+                                                       adId:@1];
   ad.manager = mockManager;
 
   id appOpenClassMock = OCMClassMock([GADAppOpenAd class]);

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTGamInterstitialAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTGamInterstitialAdTest.m
@@ -35,12 +35,9 @@ - (void)testLoadShowInterstitialAd {
   GAMRequest *gadRequest = OCMClassMock([GAMRequest class]);
   OCMStub([request asGAMRequest:[OCMArg any]]).andReturn(gadRequest);
 
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
   FLTGAMInterstitialAd *ad =
       [[FLTGAMInterstitialAd alloc] initWithAdUnitId:@"testId"
                                              request:request
-                                  rootViewController:mockRootViewController
                                                 adId:@1];
   ad.manager = mockManager;
 
@@ -120,8 +117,8 @@ - (void)testLoadShowInterstitialAd {
   // Show the ad
   [ad show];
 
-  OCMVerify([interstitialClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]]);
+  OCMVerify(
+      [interstitialClassMock presentFromRootViewController:[OCMArg isNil]]);
 
   // Verify full screen callbacks.
   OCMVerify([mockManager adWillPresentFullScreenContent:[OCMArg isEqual:ad]]);
@@ -145,12 +142,9 @@ - (void)testFailToLoad {
   GAMRequest *gadRequest = OCMClassMock([GAMRequest class]);
   OCMStub([request asGAMRequest:[OCMArg any]]).andReturn(gadRequest);
 
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
   FLTGAMInterstitialAd *ad =
       [[FLTGAMInterstitialAd alloc] initWithAdUnitId:@"testId"
                                              request:request
-                                  rootViewController:mockRootViewController
                                                 adId:@1];
   ad.manager = mockManager;