[flutter_tools] replace --no-analytics with --suppress-analytics (#123133)
[flutter_tools] replace --no-analytics with --suppress-analytics
diff --git a/bin/internal/shared.bat b/bin/internal/shared.bat
index 0599ab0..d2f4160 100644
--- a/bin/internal/shared.bat
+++ b/bin/internal/shared.bat
@@ -152,7 +152,7 @@
SET /A remaining_tries=%total_tries%-1
:retry_pub_upgrade
ECHO Running pub upgrade... 1>&2
- "%dart%" --no-analytics pub upgrade
+ "%dart%" pub upgrade --suppress-analytics
IF "%ERRORLEVEL%" EQU "0" goto :upgrade_succeeded
ECHO Error (%ERRORLEVEL%): Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left) 1>&2
timeout /t 5 /nobreak 2>NUL
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
index a38dd35..93dc7d7 100644
--- a/bin/internal/shared.sh
+++ b/bin/internal/shared.sh
@@ -21,7 +21,7 @@
local total_tries="10"
local remaining_tries=$((total_tries - 1))
while [[ "$remaining_tries" -gt 0 ]]; do
- (cd "$FLUTTER_TOOLS_DIR" && "$DART" --no-analytics pub upgrade) && break
+ (cd "$FLUTTER_TOOLS_DIR" && "$DART" pub upgrade --suppress-analytics) && break
>&2 echo "Error: Unable to 'pub upgrade' flutter tool. Retrying in five seconds... ($remaining_tries tries left)"
remaining_tries=$((remaining_tries - 1))
sleep 5
diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart
index a7e513a..331f7dc 100644
--- a/packages/flutter_tools/lib/src/dart/pub.dart
+++ b/packages/flutter_tools/lib/src/dart/pub.dart
@@ -581,7 +581,7 @@
'permissions for the current user.'
);
}
- return <String>[sdkPath, '--no-analytics', 'pub'];
+ return <String>[sdkPath, 'pub', '--suppress-analytics'];
}
// Returns the environment value that should be used when running pub.
diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
index 3d8568e..07a7f52 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
@@ -1950,14 +1950,14 @@
await runner.run(<String>['create', '--pub', projectDir.path]);
final RegExp dartCommand = RegExp(r'dart-sdk[\\/]bin[\\/]dart');
expect(loggingProcessManager.commands, contains(predicate(
- (List<String> c) => dartCommand.hasMatch(c[0]) && c[2].contains('pub') && !c.contains('--offline')
+ (List<String> c) => dartCommand.hasMatch(c[0]) && c[1].contains('pub') && !c.contains('--offline')
)));
// Run pub offline.
loggingProcessManager.clear();
await runner.run(<String>['create', '--pub', '--offline', projectDir.path]);
expect(loggingProcessManager.commands, contains(predicate(
- (List<String> c) => dartCommand.hasMatch(c[0]) && c[2].contains('pub') && c.contains('--offline')
+ (List<String> c) => dartCommand.hasMatch(c[0]) && c[1].contains('pub') && c.contains('--offline'),
)));
},
overrides: <Type, Generator>{
diff --git a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
index 6410c8c..0a9be00 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
@@ -488,7 +488,7 @@
globals.fs.directory('/packages/flutter_tools').createSync(recursive: true);
globals.fs.file('pubspec.yaml').createSync();
processManager.addCommand(
- const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', 'test']),
+ const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'run', 'test']),
);
await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']);
@@ -514,7 +514,7 @@
Cache.flutterRoot = '';
globals.fs.file('pubspec.yaml').createSync();
processManager.addCommand(
- const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', '--trace', 'run', 'test']),
+ const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', '--trace', 'run', 'test']),
);
await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']);
@@ -543,7 +543,7 @@
processManager.addCommand(
FakeCommand(
command: const <String>[
- '/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', '--foo', 'bar',
+ '/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'run', '--foo', 'bar',
],
stdin: stdin,
),
@@ -574,7 +574,7 @@
processManager.addCommand(
FakeCommand(
command: const <String>[
- '/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'token', 'list',
+ '/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'token', 'list',
],
stdin: stdin,
),
@@ -603,7 +603,7 @@
processManager.addCommand(
FakeCommand(
command: const <String>[
- '/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'upgrade', '-h',
+ '/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'upgrade', '-h',
],
stdin: IOSink(StreamController<List<int>>().sink),
),
diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
index 698fccb..ed94341 100644
--- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
+++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
@@ -55,8 +55,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -106,8 +106,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -157,8 +157,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -275,8 +275,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -317,8 +317,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -358,8 +358,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand(command: const <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -399,8 +399,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -438,8 +438,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -480,8 +480,8 @@
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -528,8 +528,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -553,7 +553,7 @@
);
const String toolExitMessage = '''
pub get failed
-command: "bin/cache/dart-sdk/bin/dart --no-analytics pub --directory . get --example"
+command: "bin/cache/dart-sdk/bin/dart pub --suppress-analytics --directory . get --example"
pub env: {
"FLUTTER_ROOT": "",
"PUB_ENVIRONMENT": "flutter_cli:flutter_tests",
@@ -592,8 +592,8 @@
FakeCommand(
command: const <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -603,8 +603,8 @@
throw const ProcessException(
'bin/cache/dart-sdk/bin/dart',
<String>[
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -661,8 +661,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -712,8 +712,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -767,8 +767,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'cache',
'preload',
'.pub-preload-cache/a.tar.gz',
@@ -778,8 +778,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -826,8 +826,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -962,8 +962,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -1008,8 +1008,8 @@
FakeCommand(
command: const <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -1023,8 +1023,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -1034,8 +1034,8 @@
FakeCommand(
command: const <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
@@ -1049,8 +1049,8 @@
const FakeCommand(
command: <String>[
'bin/cache/dart-sdk/bin/dart',
- '--no-analytics',
'pub',
+ '--suppress-analytics',
'--directory',
'.',
'get',
