Skip to content

Commit 235f5e4

Browse files
vashworthCoderDake
authored andcommitted
Remove workarounds for plugin_lint_mac needed for older version of Cocoapods (flutter#140395)
CI has been updated to Cocoapods 1.13, which fixes previous issues with the `plugin_lint_mac` test. Remove workarounds added previously. Fixes flutter#125812. See also flutter#133584.
1 parent d0a4564 commit 235f5e4

File tree

1 file changed

+9
-29
lines changed

1 file changed

+9
-29
lines changed

dev/devicelab/bin/tasks/plugin_lint_mac.dart

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ Future<void> main() async {
3939
iosintegrationTestPodspec,
4040
'--use-libraries',
4141
'--verbose',
42-
// TODO(cyanglaz): remove allow-warnings when https://github.com/flutter/flutter/issues/125812 is fixed.
43-
// https://github.com/flutter/flutter/issues/125812
44-
'--allow-warnings',
4542
],
4643
);
4744

@@ -50,9 +47,6 @@ Future<void> main() async {
5047
macosintegrationTestPodspec,
5148
<String>[
5249
'--verbose',
53-
// TODO(cyanglaz): remove allow-warnings when https://github.com/flutter/flutter/issues/125812 is fixed.
54-
// https://github.com/flutter/flutter/issues/125812
55-
'--allow-warnings',
5650
],
5751
);
5852
});
@@ -529,27 +523,13 @@ Future<void> _tryMacOSLint(
529523
String podspecPath,
530524
List<String> extraArguments,
531525
) async {
532-
final StringBuffer lintStdout = StringBuffer();
533-
try {
534-
await eval(
535-
'pod',
536-
<String>[
537-
'lib',
538-
'lint',
539-
podspecPath,
540-
...extraArguments,
541-
],
542-
stdout: lintStdout,
543-
);
544-
} on BuildFailedError {
545-
// Temporarily ignore errors due to DT_TOOLCHAIN_DIR if it's the only error.
546-
// This error was introduced with Xcode 15. Fix was made in Cocoapods, but
547-
// is not in an official release yet.
548-
// TODO(vashworth): Stop ignoring when https://github.com/flutter/flutter/issues/133584 is complete.
549-
final String lintResult = lintStdout.toString();
550-
if (!(lintResult.contains('error: DT_TOOLCHAIN_DIR cannot be used to evaluate') &&
551-
lintResult.contains('did not pass validation, due to 1 error'))) {
552-
rethrow;
553-
}
554-
}
526+
await eval(
527+
'pod',
528+
<String>[
529+
'lib',
530+
'lint',
531+
podspecPath,
532+
...extraArguments,
533+
],
534+
);
555535
}

0 commit comments

Comments
 (0)