[tool] Make more commands work without Flutter

script/tool/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.14.2
+
+* Ensures that pub commands use `flutter` or `dart` depending on whether the
+  package requires Flutter for analysis and publishing, to support
+  non-Flutter-based repositories.
+* Adds `--skip-if-not-supporting-dart-version` to support package constraints
+  via Dart versions rather than Flutter versions.
+
 ## 0.14.1
 
 * Adds `min_dart` as an alternative to `min_flutter` in tool configuration.

script/tool/lib/src/analyze_command.dart

@@ -357,8 +357,11 @@ class AnalyzeCommand extends PackageLoopingCommand {
   }
 
   Future<bool> _runPubCommand(RepositoryPackage package, String command) async {
+    final String pubCommand = package.requiresFlutter()
+        ? flutterCommand
+        : _dartBinaryPath;
     final int exitCode = await processRunner.runAndStream(
-      flutterCommand,
+      pubCommand,
       <String>['pub', command],
       workingDir: package.directory,
     );

script/tool/lib/src/common/package_looping_command.dart

@@ -95,11 +95,20 @@ abstract class PackageLoopingCommand extends PackageCommand {
           'the provided version, or a Dart version newer than the '
           'corresponding Dart version.',
     );
+    argParser.addOption(
+      _skipByDartVersionArg,
+      help:
+          'Skip any packages that require a Dart version newer than the '
+          'provided version.',
+    );
   }
 
   static const String _skipByFlutterVersionArg =
       'skip-if-not-supporting-flutter-version';
 
+  static const String _skipByDartVersionArg =
+      'skip-if-not-supporting-dart-version';
+
   /// Packages that had at least one [logWarning] call.
   final Set<PackageEnumerationEntry> _packagesWithWarnings =
       <PackageEnumerationEntry>{};
@@ -289,9 +298,15 @@ abstract class PackageLoopingCommand extends PackageCommand {
     final Version? minFlutterVersion = minFlutterVersionArg.isEmpty
         ? null
         : Version.parse(minFlutterVersionArg);
-    final Version? minDartVersion = minFlutterVersion == null
-        ? null
-        : getDartSdkForFlutterSdk(minFlutterVersion);
+
+    // Use the explicit Dart min if provided, otherwise fall back to the
+    // version corresponding to the Flutter min if that was provided.
+    final String minDartVersionArg = getStringArg(_skipByDartVersionArg);
+    final Version? minDartVersion = minDartVersionArg.isNotEmpty
+        ? Version.parse(minDartVersionArg)
+        : (minFlutterVersion == null
+              ? null
+              : getDartSdkForFlutterSdk(minFlutterVersion));
 
     final runStart = DateTime.now();
 

script/tool/lib/src/common/pub_utils.dart

@@ -12,22 +12,17 @@ import 'repository_package.dart';
 /// Runs either `dart pub get` or `flutter pub get` in [package], depending on
 /// the package type.
 ///
-/// If [alwaysUseFlutter] is true, it will use `flutter pub get` regardless.
-/// This can be useful, for instance, to get the `flutter`-default behavior
-/// of fetching example packages as well.
-///
 /// If [streamOutput] is false, output will only be printed if the command
 /// fails.
 Future<bool> runPubGet(
   RepositoryPackage package,
   ProcessRunner processRunner,
   Platform platform, {
-  bool alwaysUseFlutter = false,
   bool streamOutput = true,
 }) async {
   // Running `dart pub get` on a Flutter package can fail if a non-Flutter Dart
   // is first in the path, so use `flutter pub get` for any Flutter package.
-  final bool useFlutter = alwaysUseFlutter || package.requiresFlutter();
+  final bool useFlutter = package.requiresFlutter();
   final command = useFlutter
       ? (platform.isWindows ? 'flutter.bat' : 'flutter')
       : 'dart';

script/tool/lib/src/publish_check_command.dart

@@ -163,8 +163,11 @@ class PublishCheckCommand extends PackageLoopingCommand {
     await _fetchExampleDeps(package);
 
     print('Running pub publish --dry-run:');
+    final String pubCommand = package.requiresFlutter()
+        ? flutterCommand
+        : 'dart';
     final io.Process process = await processRunner.start(
-      flutterCommand,
+      pubCommand,
       <String>['pub', 'publish', '--', '--dry-run'],
       workingDirectory: package.directory,
     );

script/tool/lib/src/publish_command.dart

@@ -477,8 +477,11 @@ Safe to ignore if the package is deleted in this commit.
       _ensureValidPubCredential();
     }
 
+    final String pubCommand = package.requiresFlutter()
+        ? flutterCommand
+        : 'dart';
     final io.Process publish = await processRunner.start(
-      flutterCommand,
+      pubCommand,
       <String>['pub', 'publish', ..._publishFlags],
       workingDirectory: package.directory,
     );

script/tool/pubspec.yaml

@@ -1,7 +1,7 @@
 name: flutter_plugin_tools
 description: Productivity and CI utils for Flutter team package repositories.
 repository: https://github.com/flutter/packages/tree/main/script/tool
-version: 0.14.1
+version: 0.14.2
 
 dependencies:
   args: ^2.1.0

script/tool/test/analyze_command_test.dart

@@ -136,6 +136,8 @@ void main() {
 
   group('dart analyze', () {
     test('analyzes all packages', () async {
+      // Create a non-Flutter Dart package and a Flutter plugin to make sure
+      // the right command is used for each.
       final RepositoryPackage package1 = createFakePackage('a', packagesDir);
       final RepositoryPackage plugin2 = createFakePlugin('b', packagesDir);
 
@@ -144,7 +146,7 @@ void main() {
       expect(
         processRunner.recordedCalls,
         orderedEquals(<ProcessCall>[
-          ProcessCall('flutter', const <String>['pub', 'get'], package1.path),
+          ProcessCall('dart', const <String>['pub', 'get'], package1.path),
           ProcessCall('dart', const <String>[
             'analyze',
             '--fatal-infos',
@@ -158,7 +160,7 @@ void main() {
       );
     });
 
-    test('skips flutter pub get for examples', () async {
+    test('skips pub get for examples', () async {
       final RepositoryPackage plugin1 = createFakePlugin('a', packagesDir);
 
       await runCapturingPrint(runner, <String>['analyze']);
@@ -175,7 +177,7 @@ void main() {
       );
     });
 
-    test('runs flutter pub get for non-example subpackages', () async {
+    test('runs pub get for non-example subpackages', () async {
       final RepositoryPackage mainPackage = createFakePackage('a', packagesDir);
       final Directory otherPackagesDir = mainPackage.directory.childDirectory(
         'other_packages',
@@ -194,15 +196,15 @@ void main() {
       expect(
         processRunner.recordedCalls,
         orderedEquals(<ProcessCall>[
-          ProcessCall('flutter', const <String>[
+          ProcessCall('dart', const <String>[
             'pub',
             'get',
           ], mainPackage.path),
-          ProcessCall('flutter', const <String>[
+          ProcessCall('dart', const <String>[
             'pub',
             'get',
           ], subpackage1.path),
-          ProcessCall('flutter', const <String>[
+          ProcessCall('dart', const <String>[
             'pub',
             'get',
           ], subpackage2.path),
@@ -225,7 +227,7 @@ void main() {
       expect(
         processRunner.recordedCalls,
         orderedEquals(<ProcessCall>[
-          ProcessCall('flutter', const <String>['pub', 'get'], package.path),
+          ProcessCall('dart', const <String>['pub', 'get'], package.path),
           ProcessCall('dart', const <String>[
             'analyze',
             '--fatal-infos',
@@ -255,7 +257,7 @@ void main() {
     });
 
     test(
-      'does not run flutter pub get for non-example subpackages with --lib-only',
+      'does not run pub get for non-example subpackages with --lib-only',
       () async {
         final RepositoryPackage mainPackage = createFakePackage(
           'a',
@@ -272,7 +274,7 @@ void main() {
         expect(
           processRunner.recordedCalls,
           orderedEquals(<ProcessCall>[
-            ProcessCall('flutter', const <String>[
+            ProcessCall('dart', const <String>[
               'pub',
               'get',
             ], mainPackage.path),

script/tool/test/common/package_looping_command_test.dart

@@ -501,7 +501,51 @@ skip/b
       );
     });
 
-    test('skips unsupported Dart versions when requested', () async {
+    test(
+      'skips unsupported Dart versions when requested implicitly by Flutter version',
+      () async {
+        final RepositoryPackage excluded = createFakePackage(
+          'excluded_package',
+          packagesDir,
+          dartConstraint: '>=2.18.0 <4.0.0',
+        );
+        final RepositoryPackage included = createFakePackage(
+          'a_package',
+          packagesDir,
+        );
+
+        final TestPackageLoopingCommand command = createTestCommand(
+          packageLoopingType: PackageLoopingType.includeAllSubpackages,
+          hasLongOutput: false,
+        );
+        final List<String> output = await runCommand(
+          command,
+          arguments: <String>[
+            '--skip-if-not-supporting-flutter-version=3.0.0', // Flutter 3.0.0 -> Dart 2.17.0
+          ],
+        );
+
+        expect(
+          command.checkedPackages,
+          unorderedEquals(<String>[
+            included.path,
+            getExampleDir(included).path,
+          ]),
+        );
+        expect(command.checkedPackages, isNot(contains(excluded.path)));
+
+        expect(
+          output,
+          containsAllInOrder(<String>[
+            '${_startHeadingColor}Running for a_package...$_endColor',
+            '${_startHeadingColor}Running for excluded_package...$_endColor',
+            '$_startSkipColor  SKIPPING: Does not support Dart 2.17.0$_endColor',
+          ]),
+        );
+      },
+    );
+
+    test('skips unsupported Dart versions when requested explicitly', () async {
       final RepositoryPackage excluded = createFakePackage(
         'excluded_package',
         packagesDir,
@@ -518,9 +562,7 @@ skip/b
       );
       final List<String> output = await runCommand(
         command,
-        arguments: <String>[
-          '--skip-if-not-supporting-flutter-version=3.0.0', // Flutter 3.0.0 -> Dart 2.17.0
-        ],
+        arguments: <String>['--skip-if-not-supporting-dart-version=2.17.0'],
       );
 
       expect(

script/tool/test/common/pub_utils_test.dart

@@ -53,23 +53,6 @@ void main() {
     );
   });
 
-  test('runs with Flutter for a Dart package when requested', () async {
-    final RepositoryPackage package = createFakePackage(
-      'a_package',
-      packagesDir,
-    );
-    final platform = MockPlatform();
-
-    await runPubGet(package, processRunner, platform, alwaysUseFlutter: true);
-
-    expect(
-      processRunner.recordedCalls,
-      orderedEquals(<ProcessCall>[
-        ProcessCall('flutter', const <String>['pub', 'get'], package.path),
-      ]),
-    );
-  });
-
   test('uses the correct Flutter command on Windows', () async {
     final RepositoryPackage package = createFakePackage(
       'a_package',

script/tool/test/publish_check_command_test.dart

@@ -329,7 +329,8 @@ void main() {
 
         runner = configureRunner(httpClient: mockClient);
 
-        processRunner.mockProcessesForExecutable['flutter'] = <FakeProcessInfo>[
+        processRunner.mockProcessesForExecutable['dart'] = <FakeProcessInfo>[
+          FakeProcessInfo(MockProcess(), <String>['pub', 'get']),
           FakeProcessInfo(
             MockProcess(exitCode: 1, stdout: 'Some error from pub'),
             <String>['pub', 'publish'],
@@ -355,7 +356,7 @@ void main() {
         expect(
           processRunner.recordedCalls,
           contains(
-            ProcessCall('flutter', const <String>[
+            ProcessCall('dart', const <String>[
               'pub',
               'publish',
               '--',
@@ -426,7 +427,7 @@ void main() {
         expect(
           processRunner.recordedCalls,
           contains(
-            ProcessCall('flutter', const <String>[
+            ProcessCall('dart', const <String>[
               'pub',
               'publish',
               '--',
@@ -496,7 +497,7 @@ void main() {
               'run',
               'tool/pre_publish.dart',
             ], package.directory.path),
-            ProcessCall('flutter', const <String>[
+            ProcessCall('dart', const <String>[
               'pub',
               'publish',
               '--',

script/tool/test/publish_command_test.dart

@@ -285,6 +285,29 @@ void main() {
       );
     });
 
+    test('uses dart rather than flutter for non-Flutter packages', () async {
+      final RepositoryPackage package = createFakePackage(
+        'foo',
+        packagesDir,
+        examples: <String>[],
+      );
+
+      await runCapturingPrint(commandRunner, <String>[
+        'publish',
+        '--packages=foo',
+      ]);
+
+      expect(
+        processRunner.recordedCalls,
+        contains(
+          ProcessCall('dart', const <String>[
+            'pub',
+            'publish',
+          ], package.directory.path),
+        ),
+      );
+    });
+
     test('forwards --pub-publish-flags to pub publish', () async {
       final RepositoryPackage plugin = createFakePlugin(
         'foo',