Skip to content

Commit 7d76727

Browse files
christopherfujinochristopherfujino
authored
[flutter_tools] replace --no-analytics with --suppress-analytics (#123133)
[flutter_tools] replace --no-analytics with --suppress-analytics
1 parent 4695fcc commit 7d76727

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎bin/internal/shared.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ GOTO :after_subroutine
152152
SET /A remaining_tries=%total_tries%-1
153153
:retry_pub_upgrade
154154
ECHO Running pub upgrade... 1>&2
155-
"%dart%" --no-analytics pub upgrade
155+
"%dart%" pub upgrade --suppress-analytics
156156
IF "%ERRORLEVEL%" EQU "0" goto :upgrade_succeeded
157157
ECHO Error (%ERRORLEVEL%): Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left) 1>&2
158158
timeout /t 5 /nobreak 2>NUL

‎bin/internal/shared.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function pub_upgrade_with_retry {
2121
local total_tries="10"
2222
local remaining_tries=$((total_tries - 1))
2323
while [[ "$remaining_tries" -gt 0 ]]; do
24-
(cd "$FLUTTER_TOOLS_DIR" && "$DART" --no-analytics pub upgrade) && break
24+
(cd "$FLUTTER_TOOLS_DIR" && "$DART" pub upgrade --suppress-analytics) && break
2525
>&2 echo "Error: Unable to 'pub upgrade' flutter tool. Retrying in five seconds... ($remaining_tries tries left)"
2626
remaining_tries=$((remaining_tries - 1))
2727
sleep 5

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ class _DefaultPub implements Pub {
581581
'permissions for the current user.'
582582
);
583583
}
584-
return <String>[sdkPath, '--no-analytics', 'pub'];
584+
return <String>[sdkPath, 'pub', '--suppress-analytics'];
585585
}
586586

587587
// Returns the environment value that should be used when running pub.

‎packages/flutter_tools/test/commands.shard/permeable/create_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,14 +1950,14 @@ void main() {
19501950
await runner.run(<String>['create', '--pub', projectDir.path]);
19511951
final RegExp dartCommand = RegExp(r'dart-sdk[\\/]bin[\\/]dart');
19521952
expect(loggingProcessManager.commands, contains(predicate(
1953-
(List<String> c) => dartCommand.hasMatch(c[0]) && c[2].contains('pub') && !c.contains('--offline')
1953+
(List<String> c) => dartCommand.hasMatch(c[0]) && c[1].contains('pub') && !c.contains('--offline')
19541954
)));
19551955

19561956
// Run pub offline.
19571957
loggingProcessManager.clear();
19581958
await runner.run(<String>['create', '--pub', '--offline', projectDir.path]);
19591959
expect(loggingProcessManager.commands, contains(predicate(
1960-
(List<String> c) => dartCommand.hasMatch(c[0]) && c[2].contains('pub') && c.contains('--offline')
1960+
(List<String> c) => dartCommand.hasMatch(c[0]) && c[1].contains('pub') && c.contains('--offline'),
19611961
)));
19621962
},
19631963
overrides: <Type, Generator>{

‎packages/flutter_tools/test/commands.shard/permeable/packages_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ void main() {
488488
globals.fs.directory('/packages/flutter_tools').createSync(recursive: true);
489489
globals.fs.file('pubspec.yaml').createSync();
490490
processManager.addCommand(
491-
const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', 'test']),
491+
const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'run', 'test']),
492492
);
493493
await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']);
494494

@@ -514,7 +514,7 @@ void main() {
514514
Cache.flutterRoot = '';
515515
globals.fs.file('pubspec.yaml').createSync();
516516
processManager.addCommand(
517-
const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', '--trace', 'run', 'test']),
517+
const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', '--trace', 'run', 'test']),
518518
);
519519
await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']);
520520

@@ -543,7 +543,7 @@ void main() {
543543
processManager.addCommand(
544544
FakeCommand(
545545
command: const <String>[
546-
'/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', '--foo', 'bar',
546+
'/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'run', '--foo', 'bar',
547547
],
548548
stdin: stdin,
549549
),
@@ -574,7 +574,7 @@ void main() {
574574
processManager.addCommand(
575575
FakeCommand(
576576
command: const <String>[
577-
'/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'token', 'list',
577+
'/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'token', 'list',
578578
],
579579
stdin: stdin,
580580
),
@@ -603,7 +603,7 @@ void main() {
603603
processManager.addCommand(
604604
FakeCommand(
605605
command: const <String>[
606-
'/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'upgrade', '-h',
606+
'/bin/cache/dart-sdk/bin/dart', 'pub', '--suppress-analytics', 'upgrade', '-h',
607607
],
608608
stdin: IOSink(StreamController<List<int>>().sink),
609609
),

‎packages/flutter_tools/test/general.shard/dart/pub_get_test.dart

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void main() {
5555
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
5656
const FakeCommand(command: <String>[
5757
'bin/cache/dart-sdk/bin/dart',
58-
'--no-analytics',
5958
'pub',
59+
'--suppress-analytics',
6060
'--directory',
6161
'.',
6262
'get',
@@ -106,8 +106,8 @@ void main() {
106106
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
107107
const FakeCommand(command: <String>[
108108
'bin/cache/dart-sdk/bin/dart',
109-
'--no-analytics',
110109
'pub',
110+
'--suppress-analytics',
111111
'--directory',
112112
'.',
113113
'get',
@@ -157,8 +157,8 @@ void main() {
157157
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
158158
const FakeCommand(command: <String>[
159159
'bin/cache/dart-sdk/bin/dart',
160-
'--no-analytics',
161160
'pub',
161+
'--suppress-analytics',
162162
'--directory',
163163
'.',
164164
'get',
@@ -275,8 +275,8 @@ void main() {
275275
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
276276
const FakeCommand(command: <String>[
277277
'bin/cache/dart-sdk/bin/dart',
278-
'--no-analytics',
279278
'pub',
279+
'--suppress-analytics',
280280
'--directory',
281281
'.',
282282
'get',
@@ -317,8 +317,8 @@ void main() {
317317
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
318318
const FakeCommand(command: <String>[
319319
'bin/cache/dart-sdk/bin/dart',
320-
'--no-analytics',
321320
'pub',
321+
'--suppress-analytics',
322322
'--directory',
323323
'.',
324324
'get',
@@ -358,8 +358,8 @@ void main() {
358358
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
359359
FakeCommand(command: const <String>[
360360
'bin/cache/dart-sdk/bin/dart',
361-
'--no-analytics',
362361
'pub',
362+
'--suppress-analytics',
363363
'--directory',
364364
'.',
365365
'get',
@@ -399,8 +399,8 @@ void main() {
399399
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
400400
const FakeCommand(command: <String>[
401401
'bin/cache/dart-sdk/bin/dart',
402-
'--no-analytics',
403402
'pub',
403+
'--suppress-analytics',
404404
'--directory',
405405
'.',
406406
'get',
@@ -438,8 +438,8 @@ void main() {
438438
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
439439
const FakeCommand(command: <String>[
440440
'bin/cache/dart-sdk/bin/dart',
441-
'--no-analytics',
442441
'pub',
442+
'--suppress-analytics',
443443
'--directory',
444444
'.',
445445
'get',
@@ -480,8 +480,8 @@ void main() {
480480
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
481481
const FakeCommand(command: <String>[
482482
'bin/cache/dart-sdk/bin/dart',
483-
'--no-analytics',
484483
'pub',
484+
'--suppress-analytics',
485485
'--directory',
486486
'.',
487487
'get',
@@ -528,8 +528,8 @@ void main() {
528528
const FakeCommand(
529529
command: <String>[
530530
'bin/cache/dart-sdk/bin/dart',
531-
'--no-analytics',
532531
'pub',
532+
'--suppress-analytics',
533533
'--directory',
534534
'.',
535535
'get',
@@ -553,7 +553,7 @@ void main() {
553553
);
554554
const String toolExitMessage = '''
555555
pub get failed
556-
command: "bin/cache/dart-sdk/bin/dart --no-analytics pub --directory . get --example"
556+
command: "bin/cache/dart-sdk/bin/dart pub --suppress-analytics --directory . get --example"
557557
pub env: {
558558
"FLUTTER_ROOT": "",
559559
"PUB_ENVIRONMENT": "flutter_cli:flutter_tests",
@@ -592,8 +592,8 @@ exit code: 66
592592
FakeCommand(
593593
command: const <String>[
594594
'bin/cache/dart-sdk/bin/dart',
595-
'--no-analytics',
596595
'pub',
596+
'--suppress-analytics',
597597
'--directory',
598598
'.',
599599
'get',
@@ -603,8 +603,8 @@ exit code: 66
603603
throw const ProcessException(
604604
'bin/cache/dart-sdk/bin/dart',
605605
<String>[
606-
'--no-analytics',
607606
'pub',
607+
'--suppress-analytics',
608608
'--directory',
609609
'.',
610610
'get',
@@ -661,8 +661,8 @@ exit code: 66
661661
const FakeCommand(
662662
command: <String>[
663663
'bin/cache/dart-sdk/bin/dart',
664-
'--no-analytics',
665664
'pub',
665+
'--suppress-analytics',
666666
'--directory',
667667
'.',
668668
'get',
@@ -712,8 +712,8 @@ exit code: 66
712712
const FakeCommand(
713713
command: <String>[
714714
'bin/cache/dart-sdk/bin/dart',
715-
'--no-analytics',
716715
'pub',
716+
'--suppress-analytics',
717717
'--directory',
718718
'.',
719719
'get',
@@ -767,8 +767,8 @@ exit code: 66
767767
const FakeCommand(
768768
command: <String>[
769769
'bin/cache/dart-sdk/bin/dart',
770-
'--no-analytics',
771770
'pub',
771+
'--suppress-analytics',
772772
'cache',
773773
'preload',
774774
'.pub-preload-cache/a.tar.gz',
@@ -778,8 +778,8 @@ exit code: 66
778778
const FakeCommand(
779779
command: <String>[
780780
'bin/cache/dart-sdk/bin/dart',
781-
'--no-analytics',
782781
'pub',
782+
'--suppress-analytics',
783783
'--directory',
784784
'.',
785785
'get',
@@ -826,8 +826,8 @@ exit code: 66
826826
const FakeCommand(
827827
command: <String>[
828828
'bin/cache/dart-sdk/bin/dart',
829-
'--no-analytics',
830829
'pub',
830+
'--suppress-analytics',
831831
'--directory',
832832
'.',
833833
'get',
@@ -962,8 +962,8 @@ exit code: 66
962962
const FakeCommand(
963963
command: <String>[
964964
'bin/cache/dart-sdk/bin/dart',
965-
'--no-analytics',
966965
'pub',
966+
'--suppress-analytics',
967967
'--directory',
968968
'.',
969969
'get',
@@ -1008,8 +1008,8 @@ exit code: 66
10081008
FakeCommand(
10091009
command: const <String>[
10101010
'bin/cache/dart-sdk/bin/dart',
1011-
'--no-analytics',
10121011
'pub',
1012+
'--suppress-analytics',
10131013
'--directory',
10141014
'.',
10151015
'get',
@@ -1023,8 +1023,8 @@ exit code: 66
10231023
const FakeCommand(
10241024
command: <String>[
10251025
'bin/cache/dart-sdk/bin/dart',
1026-
'--no-analytics',
10271026
'pub',
1027+
'--suppress-analytics',
10281028
'--directory',
10291029
'.',
10301030
'get',
@@ -1034,8 +1034,8 @@ exit code: 66
10341034
FakeCommand(
10351035
command: const <String>[
10361036
'bin/cache/dart-sdk/bin/dart',
1037-
'--no-analytics',
10381037
'pub',
1038+
'--suppress-analytics',
10391039
'--directory',
10401040
'.',
10411041
'get',
@@ -1049,8 +1049,8 @@ exit code: 66
10491049
const FakeCommand(
10501050
command: <String>[
10511051
'bin/cache/dart-sdk/bin/dart',
1052-
'--no-analytics',
10531052
'pub',
1053+
'--suppress-analytics',
10541054
'--directory',
10551055
'.',
10561056
'get',

0 commit comments

Comments
 (0)