Skip to content

Commit 0cfc041

Browse files
auto-submit[bot]auto-submit[bot]
andauthored
Reverts "Unpin google_mobile_ads (#180573)" (#180761)
<!-- start_original_pr_link --> Reverts: #180573 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: jtmcdole <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: broke in post submit. Requires running the lockfile generation script <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: goderbauer <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {vashworth} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: Fixes #156912. Fly-by clean-up: With the recent bump to Xcode I believe pinning `google_mobile_ads` is no longer necessary. I verified locally with `flutter build ios --verbose` that the `dev/benchmarks/platform_views_layout` build successfully. <details> <summary>Build Log</summary> ``` $ flutter build ios Resolving dependencies in `/Users/goderbauer/dev/flutter`... Downloading packages... _fe_analyzer_shared 89.0.0 (92.0.0 available) adaptive_breakpoints 0.1.7 (discontinued) analyzer 8.2.0 (9.0.0 available) archive 3.6.1 (4.0.7 available) device_info 2.0.3 (discontinued replaced by device_info_plus) ffigen 18.1.0 (20.1.1 available) gcloud 0.8.19 (0.9.0 available) googleapis 12.0.0 (15.0.0 available) googleapis_auth 1.6.0 (2.0.0 available) isolate 2.1.1 (discontinued) js 0.7.2 (discontinued) metrics_center 1.0.13 (1.0.14 available) pedantic 1.11.1 (discontinued replaced by lints) petitparser 6.1.0 (7.0.1 available) shelf_web_socket 2.0.1 (3.0.0 available) xml 6.5.0 (6.6.1 available) Got dependencies in `/Users/goderbauer/dev/flutter`! 5 packages are discontinued. 11 packages have newer versions incompatible with dependency constraints. Try `flutter pub outdated` for more information. Building com.yourcompany.platformViewsLayout for device (ios-release)... To ensure your app continues to launch on upcoming iOS versions, UIScene lifecycle support will soon be required. Please see https://flutter.dev/to/uiscene-migration for the migration guide. Warning: Missing build name (CFBundleShortVersionString). Warning: Missing build number (CFBundleVersion). Action Required: You must set a build name and number in the pubspec.yaml file version field before submitting to the App Store. Found saved certificate choice "Apple Development: Michael Goderbauer (WY4DWBNV57)". To clear, use "flutter config --clear-ios-signing-settings". Developer identity "Apple Development: Michael Goderbauer (WY4DWBNV57)" selected for iOS code signing Running pod install... 1,233ms Running Xcode build... Xcode build done. 32.5s ✓ Built build/ios/iphoneos/Runner.app (20.9MB) ``` </details> <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 61b2412 commit 0cfc041

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎packages/flutter_tools/lib/src/update_packages_pins.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const kManuallyPinnedDependencies = <String, String>{
2323
'archive': '3.6.1', // https://github.com/flutter/flutter/issues/115660
2424
'flutter_gallery_assets': '1.0.2', // Tests depend on the exact version.
2525
'flutter_template_images': '5.0.0', // Must always exactly match flutter_tools template.
26+
'google_mobile_ads': '5.1.0', // https://github.com/flutter/flutter/issues/156912
2627
'material_color_utilities': '0.13.0', // Keep pinned to latest until 1.0.0.
2728
};
2829

‎pubspec.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ packages:
326326
dependency: "direct main"
327327
description:
328328
name: google_mobile_ads
329-
sha256: f35e040875bb54e8a3455bcffed3b4ac9e9263fbf7751b9fd1ae7f30793faee8
329+
sha256: e2d18992d30b2be77cb6976b931112fc3c4612feffb5eb7a8b036bd7a64934da
330330
url: "https://pub.dev"
331331
source: hosted
332-
version: "7.0.0"
332+
version: "5.1.0"
333333
googleapis:
334334
dependency: "direct main"
335335
description:
@@ -1035,18 +1035,18 @@ packages:
10351035
dependency: "direct main"
10361036
description:
10371037
name: webview_flutter
1038-
sha256: c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba
1038+
sha256: ec81f57aa1611f8ebecf1d2259da4ef052281cb5ad624131c93546c79ccc7736
10391039
url: "https://pub.dev"
10401040
source: hosted
1041-
version: "4.13.0"
1041+
version: "4.9.0"
10421042
webview_flutter_android:
10431043
dependency: "direct main"
10441044
description:
10451045
name: webview_flutter_android
1046-
sha256: eeeb3fcd5f0ff9f8446c9f4bbc18a99b809e40297528a3395597d03aafb9f510
1046+
sha256: "47a8da40d02befda5b151a26dba71f47df471cddd91dfdb7802d0a87c5442558"
10471047
url: "https://pub.dev"
10481048
source: hosted
1049-
version: "4.10.11"
1049+
version: "3.16.9"
10501050
webview_flutter_platform_interface:
10511051
dependency: "direct main"
10521052
description:
@@ -1097,4 +1097,4 @@ packages:
10971097
version: "2.2.3"
10981098
sdks:
10991099
dart: ">=3.9.0 <4.0.0"
1100-
flutter: ">=3.35.1"
1100+
flutter: ">=3.35.0"

‎pubspec.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ dependencies:
111111
glob: 2.1.3
112112
google_fonts: 6.3.3
113113
google_identity_services_web: 0.3.3+1
114-
google_mobile_ads: 7.0.0
114+
google_mobile_ads: 5.1.0
115115
googleapis: 14.0.0
116116
googleapis_auth: 2.0.0
117117
hooks: 1.0.0
@@ -196,8 +196,8 @@ dependencies:
196196
web_socket_channel: 3.0.3
197197
webdriver: 3.1.0
198198
webkit_inspection_protocol: 1.2.1
199-
webview_flutter: 4.13.0
200-
webview_flutter_android: 4.10.11
199+
webview_flutter: 4.9.0
200+
webview_flutter_android: 3.16.9
201201
webview_flutter_platform_interface: 2.14.0
202202
webview_flutter_wkwebview: 3.23.5
203203
xdg_directories: 1.1.0
@@ -212,5 +212,4 @@ dependencies:
212212
pedantic: 1.11.1
213213
quiver: 3.2.2
214214
yaml_edit: 2.2.3
215-
216-
# PUBSPEC CHECKSUM: ve87bf
215+
# PUBSPEC CHECKSUM: unhors

0 commit comments

Comments
 (0)