Merge branch 'main' into jm/v5_3_1_sample_update

googleads · Jan 27, 2025 · 3522544 · 3522544
2 parents 47f96f3 + da088cc
commit 3522544
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 132 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -109,6 +109,5 @@ jobs:
           GOOGLEMOBILEADS_PLUGIN_SCOPE_EXAMPLE: ${{ matrix.REGEX }} 
       - name: "Flutter Format"
         run: |
-          flutter pub global activate flutter_plugin_tools
-          flutter pub global run flutter_plugin_tools format
+          dart format samples/
           ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_applovin.yaml b/.github/workflows/gma_mediation_applovin.yaml
@@ -93,12 +93,3 @@ jobs:
         run: |
           cd packages/mediation/gma_mediation_applovin/
           flutter analyze
-      - name: "Flutter Publish"
-        run: |
-          cd packages/mediation/gma_mediation_applovin/
-          flutter pub publish --dry-run
-      - name: "Flutter Format"
-        run: |
-          flutter pub global activate flutter_plugin_tools
-          flutter pub global run flutter_plugin_tools format
-          ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_chartboost.yaml b/.github/workflows/gma_mediation_chartboost.yaml
@@ -0,0 +1,44 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+name: gma_mediation_chartboost
+
+on:
+  pull_request:
+    paths:
+      - "packages/mediation/gma_mediation_chartboost/**"
+      - ".github/workflows/gma_mediation_chartboost.yaml"
+      - "packages/mediation/gma_mediation_chartboost/ios/**"
+      - "packages/mediation/gma_mediation_chartboost/android/**"
+  push:
+    branches:
+      - main
+
+jobs:
+  flutter:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          fetch-depth: 0
+      - name: "Install Flutter"
+        run: ./.github/workflows/scripts/install-flutter.sh stable
+      - name: "Install Tools"
+        run: ./.github/workflows/scripts/install-tools.sh
+      - name: "Flutter Analyze"
+        run: |
+          cd packages/mediation/gma_mediation_chartboost/
+          flutter analyze
diff --git a/.github/workflows/gma_mediation_dtexchange.yaml b/.github/workflows/gma_mediation_dtexchange.yaml
@@ -93,12 +93,3 @@ jobs:
       run: |
         cd packages/mediation/gma_mediation_dtexchange
         flutter analyze
-    - name: "Flutter Publish"
-      run: |
-        cd packages/mediation/gma_mediation_dtexchange
-        flutter pub publish --dry-run
-    - name: "Flutter Format"
-      run: |
-        flutter pub global activate flutter_plugin_tools
-        flutter pub global run flutter_plugin_tools format
-        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_inmobi.yaml b/.github/workflows/gma_mediation_inmobi.yaml
@@ -42,12 +42,3 @@ jobs:
       run: |
         cd packages/mediation/gma_mediation_inmobi
         flutter analyze
-    - name: "Flutter Publish"
-      run: |
-        cd packages/mediation/gma_mediation_inmobi
-        flutter pub publish --dry-run
-    - name: "Flutter Format"
-      run: |
-        flutter pub global activate flutter_plugin_tools
-        flutter pub global run flutter_plugin_tools format
-        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_ironsource.yaml b/.github/workflows/gma_mediation_ironsource.yaml
@@ -92,12 +92,3 @@ jobs:
       run: |
         cd packages/mediation/gma_mediation_ironsource
         flutter analyze
-    - name: "Flutter Publish"
-      run: |
-        cd packages/mediation/gma_mediation_ironsource
-        flutter pub publish --dry-run
-    - name: "Flutter Format"
-      run: |
-        flutter pub global activate flutter_plugin_tools
-        flutter pub global run flutter_plugin_tools format
-        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_liftoffmonetize.yaml b/.github/workflows/gma_mediation_liftoffmonetize.yaml
@@ -94,12 +94,3 @@ jobs:
         run: |
           cd packages/mediation/gma_mediation_liftoffmonetize
           flutter analyze
-      - name: "Flutter Publish"
-        run: |
-          cd packages/mediation/gma_mediation_liftoffmonetize
-          flutter pub publish --dry-run
-      - name: "Flutter Format"
-        run: |
-          flutter pub global activate flutter_plugin_tools
-          flutter pub global run flutter_plugin_tools format
-          ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_meta.yaml b/.github/workflows/gma_mediation_meta.yaml
@@ -42,12 +42,3 @@ jobs:
       run: |
         cd packages/mediation/gma_mediation_meta
         flutter analyze
-    - name: "Flutter Publish"
-      run: |
-        cd packages/mediation/gma_mediation_meta
-        flutter pub publish --dry-run
-    - name: "Flutter Format"
-      run: |
-        flutter pub global activate flutter_plugin_tools
-        flutter pub global run flutter_plugin_tools format
-        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_mintegral.yaml b/.github/workflows/gma_mediation_mintegral.yaml
@@ -42,12 +42,3 @@ jobs:
       run: |
         cd packages/mediation/gma_mediation_mintegral
         flutter analyze
-    - name: "Flutter Publish"
-      run: |
-        cd packages/mediation/gma_mediation_mintegral
-        flutter pub publish --dry-run
-    - name: "Flutter Format"
-      run: |
-        flutter pub global activate flutter_plugin_tools
-        flutter pub global run flutter_plugin_tools format
-        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_pangle.yaml b/.github/workflows/gma_mediation_pangle.yaml
@@ -42,12 +42,3 @@ jobs:
         run: |
           cd packages/mediation/gma_mediation_pangle/
           flutter analyze
-      - name: "Flutter Publish"
-        run: |
-          cd packages/mediation/gma_mediation_pangle/
-          flutter pub publish --dry-run
-      - name: "Flutter Format"
-        run: |
-          flutter pub global activate flutter_plugin_tools
-          flutter pub global run flutter_plugin_tools format
-          ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_unity.yaml b/.github/workflows/gma_mediation_unity.yaml
@@ -91,12 +91,3 @@ jobs:
         run: |
           cd packages/mediation/gma_mediation_unity/
           flutter analyze
-      - name: "Flutter Publish"
-        run: |
-          cd packages/mediation/gma_mediation_unity/
-          flutter pub publish --dry-run
-      - name: "Flutter Format"
-        run: |
-          flutter pub global activate flutter_plugin_tools
-          flutter pub global run flutter_plugin_tools format
-          ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/google_mobile_ads.yaml b/.github/workflows/google_mobile_ads.yaml
@@ -104,6 +104,5 @@ jobs:
           flutter pub publish --dry-run
       - name: "Flutter Format"
         run: |
-          flutter pub global activate flutter_plugin_tools
-          flutter pub global run flutter_plugin_tools format
+          dart format packages/google_mobile_ads/
           ./.github/workflows/scripts/validate-formatting.sh
diff --git a/packages/mediation/gma_mediation_applovin/CHANGELOG.md b/packages/mediation/gma_mediation_applovin/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## AppLovin Flutter Mediation Adapter Changelog
 
 #### Next Version
-* Built and tested with the Google Mobile Ads Flutter Plugin version 5.2.0.
+* Built and tested with the Google Mobile Ads Flutter Plugin version 5.3.1.
 
 #### 1.2.0
 * Verified compatibility with AppLovin Android adapter version 12.6.1.0.

diff --git a/packages/mediation/gma_mediation_applovin/pubspec.yaml b/packages/mediation/gma_mediation_applovin/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  google_mobile_ads: ^5.3.0
+  google_mobile_ads: ^5.3.1
   plugin_platform_interface: ^2.1.8
 
 dev_dependencies:

diff --git a/packages/mediation/gma_mediation_chartboost/pubspec.yaml b/packages/mediation/gma_mediation_chartboost/pubspec.yaml
@@ -11,9 +11,9 @@ dependencies:
   google_mobile_ads: ^5.2.0
   plugin_platform_interface: ^2.0.2
 dev_dependencies:
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
   lint: ^2.3.0
   pigeon: ^22.6.2
 flutter:

diff --git a/samples/admob/app_open_example/lib/consent_manager.dart b/samples/admob/app_open_example/lib/consent_manager.dart
@@ -20,7 +20,7 @@ class ConsentManager {
   /// Helper variable to determine if the privacy options form is required.
   Future<bool> isPrivacyOptionsRequired() async {
     return await ConsentInformation.instance
-        .getPrivacyOptionsRequirementStatus() ==
+            .getPrivacyOptionsRequirementStatus() ==
         PrivacyOptionsRequirementStatus.required;
   }
 
@@ -30,10 +30,10 @@ class ConsentManager {
       OnConsentGatheringCompleteListener onConsentGatheringCompleteListener) {
     // For testing purposes, you can force a DebugGeography of Eea or NotEea.
     ConsentDebugSettings debugSettings = ConsentDebugSettings(
-      // debugGeography: DebugGeography.debugGeographyEea,
-    );
+        // debugGeography: DebugGeography.debugGeographyEea,
+        );
     ConsentRequestParameters params =
-    ConsentRequestParameters(consentDebugSettings: debugSettings);
+        ConsentRequestParameters(consentDebugSettings: debugSettings);
 
     // Requesting an update to consent information should be called on every app launch.
     ConsentInformation.instance.requestConsentInfoUpdate(params, () async {
@@ -51,4 +51,4 @@ class ConsentManager {
       OnConsentFormDismissedListener onConsentFormDismissedListener) {
     ConsentForm.showPrivacyOptionsForm(onConsentFormDismissedListener);
   }
-}
+}
diff --git a/samples/admob/banner_example/lib/consent_manager.dart b/samples/admob/banner_example/lib/consent_manager.dart
@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:google_mobile_ads/google_mobile_ads.dart';
@@ -18,7 +17,7 @@ class ConsentManager {
   /// Helper variable to determine if the privacy options form is required.
   Future<bool> isPrivacyOptionsRequired() async {
     return await ConsentInformation.instance
-        .getPrivacyOptionsRequirementStatus() ==
+            .getPrivacyOptionsRequirementStatus() ==
         PrivacyOptionsRequirementStatus.required;
   }
 
@@ -28,10 +27,10 @@ class ConsentManager {
       OnConsentGatheringCompleteListener onConsentGatheringCompleteListener) {
     // For testing purposes, you can force a DebugGeography of Eea or NotEea.
     ConsentDebugSettings debugSettings = ConsentDebugSettings(
-      // debugGeography: DebugGeography.debugGeographyEea,
-    );
+        // debugGeography: DebugGeography.debugGeographyEea,
+        );
     ConsentRequestParameters params =
-    ConsentRequestParameters(consentDebugSettings: debugSettings);
+        ConsentRequestParameters(consentDebugSettings: debugSettings);
 
     // Requesting an update to consent information should be called on every app launch.
     ConsentInformation.instance.requestConsentInfoUpdate(params, () async {

diff --git a/samples/admob/interstitial_example/lib/consent_manager.dart b/samples/admob/interstitial_example/lib/consent_manager.dart
@@ -27,8 +27,8 @@ class ConsentManager {
       OnConsentGatheringCompleteListener onConsentGatheringCompleteListener) {
     // For testing purposes, you can force a DebugGeography of Eea or NotEea.
     ConsentDebugSettings debugSettings = ConsentDebugSettings(
-      // debugGeography: DebugGeography.debugGeographyEea,
-    );
+        // debugGeography: DebugGeography.debugGeographyEea,
+        );
     ConsentRequestParameters params =
         ConsentRequestParameters(consentDebugSettings: debugSettings);
 

diff --git a/samples/admob/mediation_example/lib/app_bar_item.dart b/samples/admob/mediation_example/lib/app_bar_item.dart
@@ -5,6 +5,7 @@ class AppBarItem {
 
   /// Button text.
   final String label;
+
   /// Button value.
   final int value;
 

diff --git a/samples/admob/native_platform_example/lib/consent_manager.dart b/samples/admob/native_platform_example/lib/consent_manager.dart
@@ -17,7 +17,7 @@ class ConsentManager {
   /// Helper variable to determine if the privacy options form is required.
   Future<bool> isPrivacyOptionsRequired() async {
     return await ConsentInformation.instance
-        .getPrivacyOptionsRequirementStatus() ==
+            .getPrivacyOptionsRequirementStatus() ==
         PrivacyOptionsRequirementStatus.required;
   }
 
@@ -27,10 +27,10 @@ class ConsentManager {
       OnConsentGatheringCompleteListener onConsentGatheringCompleteListener) {
     // For testing purposes, you can force a DebugGeography of Eea or NotEea.
     ConsentDebugSettings debugSettings = ConsentDebugSettings(
-      // debugGeography: DebugGeography.debugGeographyEea,
-    );
+        // debugGeography: DebugGeography.debugGeographyEea,
+        );
     ConsentRequestParameters params =
-    ConsentRequestParameters(consentDebugSettings: debugSettings);
+        ConsentRequestParameters(consentDebugSettings: debugSettings);
 
     // Requesting an update to consent information should be called on every app launch.
     ConsentInformation.instance.requestConsentInfoUpdate(params, () async {

diff --git a/samples/admob/native_template_example/lib/consent_manager.dart b/samples/admob/native_template_example/lib/consent_manager.dart
@@ -17,7 +17,7 @@ class ConsentManager {
   /// Helper variable to determine if the privacy options form is required.
   Future<bool> isPrivacyOptionsRequired() async {
     return await ConsentInformation.instance
-        .getPrivacyOptionsRequirementStatus() ==
+            .getPrivacyOptionsRequirementStatus() ==
         PrivacyOptionsRequirementStatus.required;
   }
 
@@ -27,10 +27,10 @@ class ConsentManager {
       OnConsentGatheringCompleteListener onConsentGatheringCompleteListener) {
     // For testing purposes, you can force a DebugGeography of Eea or NotEea.
     ConsentDebugSettings debugSettings = ConsentDebugSettings(
-      // debugGeography: DebugGeography.debugGeographyEea,
-    );
+        // debugGeography: DebugGeography.debugGeographyEea,
+        );
     ConsentRequestParameters params =
-    ConsentRequestParameters(consentDebugSettings: debugSettings);
+        ConsentRequestParameters(consentDebugSettings: debugSettings);
 
     // Requesting an update to consent information should be called on every app launch.
     ConsentInformation.instance.requestConsentInfoUpdate(params, () async {

diff --git a/samples/admob/rewarded_example/lib/consent_manager.dart b/samples/admob/rewarded_example/lib/consent_manager.dart
@@ -17,7 +17,7 @@ class ConsentManager {
   /// Helper variable to determine if the privacy options form is required.
   Future<bool> isPrivacyOptionsRequired() async {
     return await ConsentInformation.instance
-        .getPrivacyOptionsRequirementStatus() ==
+            .getPrivacyOptionsRequirementStatus() ==
         PrivacyOptionsRequirementStatus.required;
   }
 
@@ -30,7 +30,7 @@ class ConsentManager {
       debugGeography: DebugGeography.debugGeographyEea,
     );
     ConsentRequestParameters params =
-    ConsentRequestParameters(consentDebugSettings: debugSettings);
+        ConsentRequestParameters(consentDebugSettings: debugSettings);
 
     // Requesting an update to consent information should be called on every app launch.
     ConsentInformation.instance.requestConsentInfoUpdate(params, () async {

diff --git a/samples/admob/rewarded_interstitial_example/lib/consent_manager.dart b/samples/admob/rewarded_interstitial_example/lib/consent_manager.dart
@@ -17,7 +17,7 @@ class ConsentManager {
   /// Helper variable to determine if the privacy options form is required.
   Future<bool> isPrivacyOptionsRequired() async {
     return await ConsentInformation.instance
-        .getPrivacyOptionsRequirementStatus() ==
+            .getPrivacyOptionsRequirementStatus() ==
         PrivacyOptionsRequirementStatus.required;
   }
 
@@ -27,10 +27,10 @@ class ConsentManager {
       OnConsentGatheringCompleteListener onConsentGatheringCompleteListener) {
     // For testing purposes, you can force a DebugGeography of Eea or NotEea.
     ConsentDebugSettings debugSettings = ConsentDebugSettings(
-      // debugGeography: DebugGeography.debugGeographyEea,
-    );
+        // debugGeography: DebugGeography.debugGeographyEea,
+        );
     ConsentRequestParameters params =
-    ConsentRequestParameters(consentDebugSettings: debugSettings);
+        ConsentRequestParameters(consentDebugSettings: debugSettings);
 
     // Requesting an update to consent information should be called on every app launch.
     ConsentInformation.instance.requestConsentInfoUpdate(params, () async {