[flutter_releases] Flutter beta 2.13.0-0.3.pre Framework Cherrypicks (#102620)
* Handle CocoaPods ffi stderr (#102327)
* Hide unresolved DartUri log messages (#102338)
* 'Create candidate branch version flutter-2.13-candidate.0 for beta'
* 'Update Engine revision to 3096903c8923608d3c1ccf8058a29c31a2bfbc53 for beta release 2.13.0-0.3.pre'
* Update release-candidate-branch.version
* Update packages/flutter_tools/lib/src/macos/cocoapods.dart
* Remove skipped test from CP issue
Co-authored-by: Jenn Magder <magder@google.com>
Co-authored-by: Elliott Brooks (she/her) <21270878+elliette@users.noreply.github.com>
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 9828924..2d92142 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-24a02fa5ee681840cdc842c22f4cb4bdd5ec3115
+3096903c8923608d3c1ccf8058a29c31a2bfbc53
diff --git a/packages/flutter_tools/lib/src/isolated/devfs_web.dart b/packages/flutter_tools/lib/src/isolated/devfs_web.dart
index b111111..a02b588 100644
--- a/packages/flutter_tools/lib/src/isolated/devfs_web.dart
+++ b/packages/flutter_tools/lib/src/isolated/devfs_web.dart
@@ -1006,6 +1006,16 @@
if (event.level >= logging.Level.SEVERE) {
globals.printError('${event.loggerName}: ${event.message}$error', stackTrace: event.stackTrace);
} else if (event.level == logging.Level.WARNING) {
+ // TODO(elliette): Remove the following message suppressions after DWDS is
+ // >13.1.0, https://github.com/flutter/flutter/issues/101639
+ const String dartUri = 'DartUri';
+ if (event.loggerName == dartUri) {
+ const String webSqlWarning = 'Unresolved uri: dart:web_sql';
+ const String uiWarning = 'Unresolved uri: dart:ui';
+ if (event.message == webSqlWarning || event.message == uiWarning) {
+ return;
+ }
+ }
globals.printWarning('${event.loggerName}: ${event.message}$error');
} else {
globals.printTrace('${event.loggerName}: ${event.message}$error');
diff --git a/packages/flutter_tools/lib/src/macos/cocoapods.dart b/packages/flutter_tools/lib/src/macos/cocoapods.dart
index 7c3689e..26365b6 100644
--- a/packages/flutter_tools/lib/src/macos/cocoapods.dart
+++ b/packages/flutter_tools/lib/src/macos/cocoapods.dart
@@ -349,10 +349,11 @@
}
void _diagnosePodInstallFailure(ProcessResult result) {
- if (result.stdout is! String) {
+ final Object? stdout = result.stdout;
+ final Object? stderr = result.stderr;
+ if (stdout is! String || stderr is! String) {
return;
}
- final String stdout = result.stdout as String;
if (stdout.contains('out-of-date source repos')) {
_logger.printError(
"Error: CocoaPods's specs repository is too out-of-date to satisfy dependencies.\n"
@@ -360,7 +361,7 @@
' pod repo update\n',
emphasis: true,
);
- } else if (stdout.contains('ffi_c.bundle') && stdout.contains('LoadError') &&
+ } else if ((stderr.contains('ffi_c.bundle') || stderr.contains('/ffi/')) &&
_operatingSystemUtils.hostPlatform == HostPlatform.darwin_arm) {
// https://github.com/flutter/flutter/issues/70796
UsageEvent(
diff --git a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
index b49ea1f..e596bcc 100644
--- a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
@@ -513,7 +513,7 @@
'LANG': 'en_US.UTF-8',
},
exitCode: 1,
- stdout: cocoaPodsError,
+ stderr: cocoaPodsError,
),
const FakeCommand(
command: <String>['which', 'sysctl'],
diff --git a/packages/flutter_tools/test/web.shard/output_web_test.dart b/packages/flutter_tools/test/web.shard/output_web_test.dart
index b14660e..7fef5bc 100644
--- a/packages/flutter_tools/test/web.shard/output_web_test.dart
+++ b/packages/flutter_tools/test/web.shard/output_web_test.dart
@@ -78,4 +78,18 @@
await sendEvent(<String, Object>{'type': 'DevtoolsEvent'});
await warning;
});
+
+ testWithoutContext(
+ 'flutter run output skips DartUri warning messages from dwds', () async {
+ bool containsDartUriWarning = false;
+ flutter.stderr.listen((String msg) {
+ if (msg.contains('DartUri')) {
+ containsDartUriWarning = true;
+ }
+ });
+ await start();
+ await flutter.stop();
+ expect(containsDartUriWarning, isFalse);
+ // TODO(elliette): Enable for DWDS >13.1.0, https://github.com/flutter/flutter/issues/101639
+ }, skip: true); // [intended] enable for DWDS >13.1.0
}
