Merge pull request #62 from firebase/feat/update-admob

feat: Update Admob to latest version

Author: HYACCCINT

admob/analysis_options.yaml

@@ -22,8 +22,7 @@ linter:
  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
  # producing the lint.
  rules:
- # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+ avoid_print: false # Uncomment to disable the `avoid_print` rule
  # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
-
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

admob/ios/Podfile.lock

@@ -0,0 +1,92 @@
+PODS:
+ - Flutter (1.0.0)
+ - Google-Mobile-Ads-SDK (10.11.0):
+ - GoogleAppMeasurement (< 11.0, >= 7.0)
+ - GoogleUserMessagingPlatform (>= 1.1)
+ - google_mobile_ads (1.0.0):
+ - Flutter
+ - Google-Mobile-Ads-SDK (~> 10.11.0)
+ - webview_flutter_wkwebview
+ - GoogleAppMeasurement (10.19.0):
+ - GoogleAppMeasurement/AdIdSupport (= 10.19.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
+ - GoogleUtilities/MethodSwizzler (~> 7.11)
+ - GoogleUtilities/Network (~> 7.11)
+ - "GoogleUtilities/NSData+zlib (~> 7.11)"
+ - nanopb (< 2.30910.0, >= 2.30908.0)
+ - GoogleAppMeasurement/AdIdSupport (10.19.0):
+ - GoogleAppMeasurement/WithoutAdIdSupport (= 10.19.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
+ - GoogleUtilities/MethodSwizzler (~> 7.11)
+ - GoogleUtilities/Network (~> 7.11)
+ - "GoogleUtilities/NSData+zlib (~> 7.11)"
+ - nanopb (< 2.30910.0, >= 2.30908.0)
+ - GoogleAppMeasurement/WithoutAdIdSupport (10.19.0):
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
+ - GoogleUtilities/MethodSwizzler (~> 7.11)
+ - GoogleUtilities/Network (~> 7.11)
+ - "GoogleUtilities/NSData+zlib (~> 7.11)"
+ - nanopb (< 2.30910.0, >= 2.30908.0)
+ - GoogleUserMessagingPlatform (2.1.0)
+ - GoogleUtilities/AppDelegateSwizzler (7.12.0):
+ - GoogleUtilities/Environment
+ - GoogleUtilities/Logger
+ - GoogleUtilities/Network
+ - GoogleUtilities/Environment (7.12.0):
+ - PromisesObjC (< 3.0, >= 1.2)
+ - GoogleUtilities/Logger (7.12.0):
+ - GoogleUtilities/Environment
+ - GoogleUtilities/MethodSwizzler (7.12.0):
+ - GoogleUtilities/Logger
+ - GoogleUtilities/Network (7.12.0):
+ - GoogleUtilities/Logger
+ - "GoogleUtilities/NSData+zlib"
+ - GoogleUtilities/Reachability
+ - "GoogleUtilities/NSData+zlib (7.12.0)"
+ - GoogleUtilities/Reachability (7.12.0):
+ - GoogleUtilities/Logger
+ - nanopb (2.30909.1):
+ - nanopb/decode (= 2.30909.1)
+ - nanopb/encode (= 2.30909.1)
+ - nanopb/decode (2.30909.1)
+ - nanopb/encode (2.30909.1)
+ - PromisesObjC (2.3.1)
+ - webview_flutter_wkwebview (0.0.1):
+ - Flutter
+
+DEPENDENCIES:
+ - Flutter (from `Flutter`)
+ - google_mobile_ads (from `.symlinks/plugins/google_mobile_ads/ios`)
+ - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
+
+SPEC REPOS:
+ trunk:
+ - Google-Mobile-Ads-SDK
+ - GoogleAppMeasurement
+ - GoogleUserMessagingPlatform
+ - GoogleUtilities
+ - nanopb
+ - PromisesObjC
+
+EXTERNAL SOURCES:
+ Flutter:
+ :path: Flutter
+ google_mobile_ads:
+ :path: ".symlinks/plugins/google_mobile_ads/ios"
+ webview_flutter_wkwebview:
+ :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
+
+SPEC CHECKSUMS:
+ Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+ Google-Mobile-Ads-SDK: 58b4fda3f9758fc1ed210aa5cf7777b5eb55d47e
+ google_mobile_ads: 511febb4768edc860ee455a9e201ff52de385908
+ GoogleAppMeasurement: 68afe759316673c6554dac35a0c7ae8f5d6cb4ed
+ GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf
+ GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+ nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
+ PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+ webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
+
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+
+COCOAPODS: 1.13.0

admob/ios/Runner.xcodeproj/project.pbxproj

@@ -3,12 +3,13 @@
 archiveVersion = 1;
 classes = {
 };
-objectVersion = 50;
+objectVersion = 54;
 objects = {
 
 /* Begin PBXBuildFile section */
 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+6F1EB87BE6EB1CE545C6C6D8 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0554B3A0B085A39FA12E9253 /* Pods_Runner.framework */; };
 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -29,12 +30,16 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+0554B3A0B085A39FA12E9253 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+328D3A16E752CEED566AB6BB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+33CAF77D97F7CA280CE2DDCF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+828F7299D9587EB1F6C559E1 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -49,12 +54,21 @@
 isa = PBXFrameworksBuildPhase;
 buildActionMask = 2147483647;
 files = (
+6F1EB87BE6EB1CE545C6C6D8 /* Pods_Runner.framework in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+90D84C5DA31C2FF6A4C6E362 /* Frameworks */ = {
+isa = PBXGroup;
+children = (
+0554B3A0B085A39FA12E9253 /* Pods_Runner.framework */,
+);
+name = Frameworks;
+sourceTree = "<group>";
+};
 9740EEB11CF90186004384FC /* Flutter */ = {
 isa = PBXGroup;
 children = (
@@ -72,6 +86,8 @@
 9740EEB11CF90186004384FC /* Flutter */,
 97C146F01CF9000F007C117D /* Runner */,
 97C146EF1CF9000F007C117D /* Products */,
+D592F3B67D19BD8FC8AC80DF /* Pods */,
+90D84C5DA31C2FF6A4C6E362 /* Frameworks */,
 );
 sourceTree = "<group>";
 };
@@ -98,19 +114,33 @@
 path = Runner;
 sourceTree = "<group>";
 };
+D592F3B67D19BD8FC8AC80DF /* Pods */ = {
+isa = PBXGroup;
+children = (
+828F7299D9587EB1F6C559E1 /* Pods-Runner.debug.xcconfig */,
+33CAF77D97F7CA280CE2DDCF /* Pods-Runner.release.xcconfig */,
+328D3A16E752CEED566AB6BB /* Pods-Runner.profile.xcconfig */,
+);
+name = Pods;
+path = Pods;
+sourceTree = "<group>";
+};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 97C146ED1CF9000F007C117D /* Runner */ = {
 isa = PBXNativeTarget;
 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 buildPhases = (
+EA8FA25447621806A7F1B212 /* [CP] Check Pods Manifest.lock */,
 9740EEB61CF901F6004384FC /* Run Script */,
 97C146EA1CF9000F007C117D /* Sources */,
 97C146EB1CF9000F007C117D /* Frameworks */,
 97C146EC1CF9000F007C117D /* Resources */,
 9705A1C41CF9048500538489 /* Embed Frameworks */,
 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+D8DA98AB9D98E67F63D4D976 /* [CP] Embed Pods Frameworks */,
+66181D404FB9AB067CCC5685 /* [CP] Copy Pods Resources */,
 );
 buildRules = (
 );
@@ -127,7 +157,7 @@
 97C146E61CF9000F007C117D /* Project object */ = {
 isa = PBXProject;
 attributes = {
-LastUpgradeCheck = 1300;
+LastUpgradeCheck = 1430;
 ORGANIZATIONNAME = "";
 TargetAttributes = {
 97C146ED1CF9000F007C117D = {
@@ -171,10 +201,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 isa = PBXShellScriptBuildPhase;
+alwaysOutOfDate = 1;
 buildActionMask = 2147483647;
 files = (
 );
 inputPaths = (
+"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 );
 name = "Thin Binary";
 outputPaths = (
@@ -183,8 +215,26 @@
 shellPath = /bin/sh;
 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 };
+66181D404FB9AB067CCC5685 /* [CP] Copy Pods Resources */ = {
+isa = PBXShellScriptBuildPhase;
+buildActionMask = 2147483647;
+files = (
+);
+inputFileListPaths = (
+"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+);
+name = "[CP] Copy Pods Resources";
+outputFileListPaths = (
+"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+);
+runOnlyForDeploymentPostprocessing = 0;
+shellPath = /bin/sh;
+shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+showEnvVarsInLog = 0;
+};
 9740EEB61CF901F6004384FC /* Run Script */ = {
 isa = PBXShellScriptBuildPhase;
+alwaysOutOfDate = 1;
 buildActionMask = 2147483647;
 files = (
 );
@@ -197,6 +247,45 @@
 shellPath = /bin/sh;
 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 };
+D8DA98AB9D98E67F63D4D976 /* [CP] Embed Pods Frameworks */ = {
+isa = PBXShellScriptBuildPhase;
+buildActionMask = 2147483647;
+files = (
+);
+inputFileListPaths = (
+"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+);
+name = "[CP] Embed Pods Frameworks";
+outputFileListPaths = (
+"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+);
+runOnlyForDeploymentPostprocessing = 0;
+shellPath = /bin/sh;
+shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+showEnvVarsInLog = 0;
+};
+EA8FA25447621806A7F1B212 /* [CP] Check Pods Manifest.lock */ = {
+isa = PBXShellScriptBuildPhase;
+buildActionMask = 2147483647;
+files = (
+);
+inputFileListPaths = (
+);
+inputPaths = (
+"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+"${PODS_ROOT}/Manifest.lock",
+);
+name = "[CP] Check Pods Manifest.lock";
+outputFileListPaths = (
+);
+outputPaths = (
+"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+);
+runOnlyForDeploymentPostprocessing = 0;
+shellPath = /bin/sh;
+shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+showEnvVarsInLog = 0;
+};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

admob/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1300"
+ LastUpgradeVersion = "1430"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

admob/ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -2,19 +2,17 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:provider/provider.dart';
 
 void main() {
  WidgetsFlutterBinding.ensureInitialized();
 
- runApp(ChangeNotifierProvider(
- create: (context) => ApplicationState(),
- builder: (context, child) => const MyApp(),
- ));
+ runApp(MyApp(state: ApplicationState()));
 }
 
 class MyApp extends StatelessWidget {
- const MyApp({super.key});
+ const MyApp({super.key, required this.state});
+
+ final ApplicationState state;
 
  // This widget is the root of your application.
  @override
@@ -33,13 +31,15 @@ class MyApp extends StatelessWidget {
  // is not restarted.
  primarySwatch: Colors.blue,
  ),
- home: const MyHomePage(title: 'AdMob Quickstart'),
+ home: MyHomePage(title: 'AdMob Quickstart', state: state),
  );
  }
 }
 
 class MyHomePage extends StatelessWidget {
- const MyHomePage({super.key, required this.title});
+ const MyHomePage({super.key, required this.title, required this.state});
+
+ final ApplicationState state;
 
  final String title;
  @override
@@ -48,8 +48,9 @@ class MyHomePage extends StatelessWidget {
  appBar: AppBar(
  title: Text(title),
  ),
- body: Consumer<ApplicationState>(
- builder: (context, appState, _) => Column(
+ body: ListenableBuilder(
+ listenable: state,
+ builder: (context, child) => Column(
  children: <Widget>[
  const Padding(
  padding: EdgeInsets.all(64.0),
@@ -66,22 +67,22 @@ class MyHomePage extends StatelessWidget {
  'analytics capabilities.'),
  ),
  ElevatedButton(
- onPressed: appState.interstitialAd != null
+ onPressed: state.interstitialAd != null
  ? () {
- appState.showInterstitial();
+ state.showInterstitial();
  }
  : null,
  child: const Text('Load Interstitial'),
  ),
  const Expanded(child: SizedBox.shrink()),
- appState.bannerAd != null
+ state.bannerAd != null
  ? Align(
  alignment: Alignment.bottomCenter,
  child: Container(
  alignment: Alignment.bottomCenter,
- width: appState.bannerAd!.size.width.toDouble(),
- height: appState.bannerAd!.size.height.toDouble(),
- child: AdWidget(ad: appState.bannerAd!),
+ width: state.bannerAd!.size.width.toDouble(),
+ height: state.bannerAd!.size.height.toDouble(),
+ child: AdWidget(ad: state.bannerAd!),
  ),
  )
  : const SizedBox.shrink(),