From 14f70bea1a96b9507e30a7a5656d0db226367f90 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Wed, 27 May 2026 15:31:56 -0400
Subject: [PATCH 1/6] [tool] Make more commands work without Flutter

Updates some cases where 'flutter' was used unconditionally, now that we
need to support a repository without Flutter installed.

Removes some outdated comments and plumbing for forcing `flutter pub`
over `dart pub`, as the reason we used to do it no longer applies now
that `dart pub` also fetches examples by default.
---
 script/tool/CHANGELOG.md                      |  6 +++++
 script/tool/lib/src/analyze_command.dart      |  5 +++-
 script/tool/lib/src/common/pub_utils.dart     |  7 +-----
 .../tool/lib/src/publish_check_command.dart   |  5 +++-
 script/tool/lib/src/publish_command.dart      |  5 +++-
 script/tool/pubspec.yaml                      |  2 +-
 script/tool/test/analyze_command_test.dart    | 20 +++++++++-------
 script/tool/test/common/pub_utils_test.dart   | 17 -------------
 .../tool/test/publish_check_command_test.dart |  9 +++----
 script/tool/test/publish_command_test.dart    | 24 +++++++++++++++++++
 10 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/script/tool/CHANGELOG.md b/script/tool/CHANGELOG.md
index 4bc8c56d7809..d5ec65f383ea 100644
--- a/script/tool/CHANGELOG.md
+++ b/script/tool/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 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
+
 ## 0.14.1
 
 * Adds `min_dart` as an alternative to `min_flutter` in tool configuration.
diff --git a/script/tool/lib/src/analyze_command.dart b/script/tool/lib/src/analyze_command.dart
index 91f247eed2c2..0841ae4ceba4 100644
--- a/script/tool/lib/src/analyze_command.dart
+++ b/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
+        : 'dart';
     final int exitCode = await processRunner.runAndStream(
-      flutterCommand,
+      pubCommand,
       <String>['pub', command],
       workingDir: package.directory,
     );
diff --git a/script/tool/lib/src/common/pub_utils.dart b/script/tool/lib/src/common/pub_utils.dart
index 963a548aef68..9e30ccf76022 100644
--- a/script/tool/lib/src/common/pub_utils.dart
+++ b/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';
diff --git a/script/tool/lib/src/publish_check_command.dart b/script/tool/lib/src/publish_check_command.dart
index dbb6a0711e83..91b4d54b906b 100644
--- a/script/tool/lib/src/publish_check_command.dart
+++ b/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,
     );
diff --git a/script/tool/lib/src/publish_command.dart b/script/tool/lib/src/publish_command.dart
index 41d982d4d9d3..f20d3f43ae9f 100644
--- a/script/tool/lib/src/publish_command.dart
+++ b/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,
     );
diff --git a/script/tool/pubspec.yaml b/script/tool/pubspec.yaml
index 1752a98250f0..ed259156675f 100644
--- a/script/tool/pubspec.yaml
+++ b/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
diff --git a/script/tool/test/analyze_command_test.dart b/script/tool/test/analyze_command_test.dart
index 9e0b2d6a0752..a66bb4cfdeec 100644
--- a/script/tool/test/analyze_command_test.dart
+++ b/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),
diff --git a/script/tool/test/common/pub_utils_test.dart b/script/tool/test/common/pub_utils_test.dart
index d18b1290a239..2dcc3627c9b5 100644
--- a/script/tool/test/common/pub_utils_test.dart
+++ b/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',
diff --git a/script/tool/test/publish_check_command_test.dart b/script/tool/test/publish_check_command_test.dart
index 7b1b265e63a4..cd11427772ab 100644
--- a/script/tool/test/publish_check_command_test.dart
+++ b/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',
               '--',
diff --git a/script/tool/test/publish_command_test.dart b/script/tool/test/publish_command_test.dart
index 0438b8cffeda..56ef4f81c2df 100644
--- a/script/tool/test/publish_command_test.dart
+++ b/script/tool/test/publish_command_test.dart
@@ -285,6 +285,30 @@ void main() {
       );
     });
 
+    test('uses dart rather than flutter for non-Flutter packages', () async {
+      final RepositoryPackage package = createFakePackage(
+        'foo',
+        packagesDir,
+        isFlutter: false,
+        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',

From d572a8b6660b6e9d06e0e5206e43f5e46fb92fd9 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Wed, 27 May 2026 15:37:20 -0400
Subject: [PATCH 2/6] Use passed binary path for Dart

---
 script/tool/lib/src/analyze_command.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/tool/lib/src/analyze_command.dart b/script/tool/lib/src/analyze_command.dart
index 0841ae4ceba4..1e0ac62adcab 100644
--- a/script/tool/lib/src/analyze_command.dart
+++ b/script/tool/lib/src/analyze_command.dart
@@ -359,7 +359,7 @@ class AnalyzeCommand extends PackageLoopingCommand {
   Future<bool> _runPubCommand(RepositoryPackage package, String command) async {
     final String pubCommand = package.requiresFlutter()
         ? flutterCommand
-        : 'dart';
+        : _dartBinaryPath;
     final int exitCode = await processRunner.runAndStream(
       pubCommand,
       <String>['pub', command],

From 5ee1ff176227e126b890760e30c33cfef78fd88d Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Wed, 27 May 2026 15:47:00 -0400
Subject: [PATCH 3/6] Analyzer fix

---
 script/tool/test/publish_command_test.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/script/tool/test/publish_command_test.dart b/script/tool/test/publish_command_test.dart
index 56ef4f81c2df..f32119b4f230 100644
--- a/script/tool/test/publish_command_test.dart
+++ b/script/tool/test/publish_command_test.dart
@@ -289,7 +289,6 @@ void main() {
       final RepositoryPackage package = createFakePackage(
         'foo',
         packagesDir,
-        isFlutter: false,
         examples: <String>[],
       );
 

From 025cea020601c90bb5f265b5d5e58541f99c808c Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Wed, 27 May 2026 16:07:38 -0400
Subject: [PATCH 4/6] Add --skip-if-not-supporting-dart-version

---
 script/tool/CHANGELOG.md                      |  4 +-
 .../src/common/package_looping_command.dart   | 21 ++++++--
 .../common/package_looping_command_test.dart  | 50 +++++++++++++++++--
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/script/tool/CHANGELOG.md b/script/tool/CHANGELOG.md
index d5ec65f383ea..55aeacaf445b 100644
--- a/script/tool/CHANGELOG.md
+++ b/script/tool/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 * 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
+  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
 
diff --git a/script/tool/lib/src/common/package_looping_command.dart b/script/tool/lib/src/common/package_looping_command.dart
index 53c885bcf6e7..04a284f7b720 100644
--- a/script/tool/lib/src/common/package_looping_command.dart
+++ b/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();
 
diff --git a/script/tool/test/common/package_looping_command_test.dart b/script/tool/test/common/package_looping_command_test.dart
index 1589e748b435..49b1efd5a275 100644
--- a/script/tool/test/common/package_looping_command_test.dart
+++ b/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(

From 202187ba4faf9775a5dc49c92ddd0f78e2dbfe8c Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Thu, 28 May 2026 10:26:17 -0400
Subject: [PATCH 5/6] Refactor pub utils

---
 script/tool/lib/src/analyze_command.dart      | 15 +++--
 script/tool/lib/src/common/pub_utils.dart     | 63 ++++++++++++++++---
 .../tool/lib/src/publish_check_command.dart   | 12 ++--
 script/tool/lib/src/publish_command.dart      | 12 ++--
 script/tool/test/analyze_command_test.dart    | 20 ++----
 5 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/script/tool/lib/src/analyze_command.dart b/script/tool/lib/src/analyze_command.dart
index 1e0ac62adcab..9f32195e9bdc 100644
--- a/script/tool/lib/src/analyze_command.dart
+++ b/script/tool/lib/src/analyze_command.dart
@@ -13,6 +13,7 @@ import 'common/gradle.dart';
 import 'common/output_utils.dart';
 import 'common/package_looping_command.dart';
 import 'common/plugin_utils.dart';
+import 'common/pub_utils.dart';
 import 'common/repository_package.dart';
 import 'common/xcode.dart';
 
@@ -357,15 +358,13 @@ 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(
-      pubCommand,
-      <String>['pub', command],
-      workingDir: package.directory,
+    return runPubCommand(
+      <String>[command],
+      package,
+      processRunner,
+      platform,
+      dartSdkPathOverride: _dartBinaryPath,
     );
-    return exitCode == 0;
   }
 
   /// Runs Gradle lint analysis for the given package, and returns the result
diff --git a/script/tool/lib/src/common/pub_utils.dart b/script/tool/lib/src/common/pub_utils.dart
index 9e30ccf76022..7bed2da631b6 100644
--- a/script/tool/lib/src/common/pub_utils.dart
+++ b/script/tool/lib/src/common/pub_utils.dart
@@ -20,14 +20,34 @@ Future<bool> runPubGet(
   Platform platform, {
   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 = package.requiresFlutter();
-  final command = useFlutter
-      ? (platform.isWindows ? 'flutter.bat' : 'flutter')
-      : 'dart';
-  final args = <String>['pub', 'get'];
+  return runPubCommand(
+    <String>['get'],
+    package,
+    processRunner,
+    platform,
+    streamOutput: streamOutput,
+  );
+}
 
+/// Runs a pub command with the given arguments in [package],
+/// using either 'dart' or 'flutter' depending on the package type.
+///
+/// If [streamOutput] is false, output will only be printed if the command
+/// fails.
+Future<bool> runPubCommand(
+  List<String> commandArgs,
+  RepositoryPackage package,
+  ProcessRunner processRunner,
+  Platform platform, {
+  bool streamOutput = true,
+  String? dartSdkPathOverride,
+}) async {
+  final String command = _pubCommand(
+    package,
+    platform,
+    dartSdkPathOverride: dartSdkPathOverride,
+  );
+  final args = <String>['pub', ...commandArgs];
   final int exitCode;
   if (streamOutput) {
     exitCode = await processRunner.runAndStream(
@@ -48,3 +68,32 @@ Future<bool> runPubGet(
   }
   return exitCode == 0;
 }
+
+/// Starts a pub command with the given arguments in [package],
+/// using either 'dart' or 'flutter' depending on the package type, and returns
+/// a process that can be used to wait for completion and stream output.
+///
+/// If no output capturing is necessary, prefer [runPubCommand].
+Future<io.Process> startPubCommand(
+  List<String> commandArgs,
+  RepositoryPackage package,
+  ProcessRunner processRunner,
+  Platform platform,
+) async {
+  return processRunner.start(_pubCommand(package, platform), <String>[
+    'pub',
+    ...commandArgs,
+  ], workingDirectory: package.directory);
+}
+
+String _pubCommand(
+  RepositoryPackage package,
+  Platform platform, {
+  String? dartSdkPathOverride,
+}) {
+  // 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.
+  return package.requiresFlutter()
+      ? (platform.isWindows ? 'flutter.bat' : 'flutter')
+      : (dartSdkPathOverride ?? 'dart');
+}
diff --git a/script/tool/lib/src/publish_check_command.dart b/script/tool/lib/src/publish_check_command.dart
index 91b4d54b906b..df590f125e6c 100644
--- a/script/tool/lib/src/publish_check_command.dart
+++ b/script/tool/lib/src/publish_check_command.dart
@@ -163,13 +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(
-      pubCommand,
-      <String>['pub', 'publish', '--', '--dry-run'],
-      workingDirectory: package.directory,
+    final io.Process process = await startPubCommand(
+      <String>['publish', '--', '--dry-run'],
+      package,
+      processRunner,
+      platform,
     );
 
     final outputBuffer = StringBuffer();
diff --git a/script/tool/lib/src/publish_command.dart b/script/tool/lib/src/publish_command.dart
index f20d3f43ae9f..54b5a4dda1da 100644
--- a/script/tool/lib/src/publish_command.dart
+++ b/script/tool/lib/src/publish_command.dart
@@ -477,13 +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(
-      pubCommand,
-      <String>['pub', 'publish', ..._publishFlags],
-      workingDirectory: package.directory,
+    final io.Process publish = await startPubCommand(
+      <String>['publish', ..._publishFlags],
+      package,
+      processRunner,
+      platform,
     );
     publish.stdout.transform(utf8.decoder).listen((String data) => print(data));
     publish.stderr.transform(utf8.decoder).listen((String data) => print(data));
diff --git a/script/tool/test/analyze_command_test.dart b/script/tool/test/analyze_command_test.dart
index a66bb4cfdeec..1f5da3ec3d32 100644
--- a/script/tool/test/analyze_command_test.dart
+++ b/script/tool/test/analyze_command_test.dart
@@ -196,18 +196,9 @@ void main() {
       expect(
         processRunner.recordedCalls,
         orderedEquals(<ProcessCall>[
-          ProcessCall('dart', const <String>[
-            'pub',
-            'get',
-          ], mainPackage.path),
-          ProcessCall('dart', const <String>[
-            'pub',
-            'get',
-          ], subpackage1.path),
-          ProcessCall('dart', const <String>[
-            'pub',
-            'get',
-          ], subpackage2.path),
+          ProcessCall('dart', const <String>['pub', 'get'], mainPackage.path),
+          ProcessCall('dart', const <String>['pub', 'get'], subpackage1.path),
+          ProcessCall('dart', const <String>['pub', 'get'], subpackage2.path),
           ProcessCall('dart', const <String>[
             'analyze',
             '--fatal-infos',
@@ -274,10 +265,7 @@ void main() {
         expect(
           processRunner.recordedCalls,
           orderedEquals(<ProcessCall>[
-            ProcessCall('dart', const <String>[
-              'pub',
-              'get',
-            ], mainPackage.path),
+            ProcessCall('dart', const <String>['pub', 'get'], mainPackage.path),
             ProcessCall('dart', const <String>[
               'analyze',
               '--fatal-infos',

From 59a8aedb6bd6b65f292e834bb1ac8426d22cf4ca Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Thu, 28 May 2026 11:27:56 -0400
Subject: [PATCH 6/6] Remove -- that dart doesn't like and flutter doesn't need

---
 script/tool/lib/src/publish_check_command.dart   | 2 +-
 script/tool/test/publish_check_command_test.dart | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/script/tool/lib/src/publish_check_command.dart b/script/tool/lib/src/publish_check_command.dart
index df590f125e6c..2e28b39e572e 100644
--- a/script/tool/lib/src/publish_check_command.dart
+++ b/script/tool/lib/src/publish_check_command.dart
@@ -164,7 +164,7 @@ class PublishCheckCommand extends PackageLoopingCommand {
 
     print('Running pub publish --dry-run:');
     final io.Process process = await startPubCommand(
-      <String>['publish', '--', '--dry-run'],
+      <String>['publish', '--dry-run'],
       package,
       processRunner,
       platform,
diff --git a/script/tool/test/publish_check_command_test.dart b/script/tool/test/publish_check_command_test.dart
index cd11427772ab..a97737517615 100644
--- a/script/tool/test/publish_check_command_test.dart
+++ b/script/tool/test/publish_check_command_test.dart
@@ -71,13 +71,11 @@ void main() {
           ProcessCall('flutter', const <String>[
             'pub',
             'publish',
-            '--',
             '--dry-run',
           ], plugin1.path),
           ProcessCall('flutter', const <String>[
             'pub',
             'publish',
-            '--',
             '--dry-run',
           ], plugin2.path),
         ]),
@@ -117,14 +115,12 @@ void main() {
           ProcessCall('flutter', const <String>[
             'pub',
             'publish',
-            '--',
             '--dry-run',
           ], plugin1.path),
           // plugin2 has no examples, so there's no extra 'dart pub get' calls.
           ProcessCall('flutter', const <String>[
             'pub',
             'publish',
-            '--',
             '--dry-run',
           ], plugin2.path),
         ]),
@@ -359,7 +355,6 @@ void main() {
             ProcessCall('dart', const <String>[
               'pub',
               'publish',
-              '--',
               '--dry-run',
             ], package.path),
           ),
@@ -430,7 +425,6 @@ void main() {
             ProcessCall('dart', const <String>[
               'pub',
               'publish',
-              '--',
               '--dry-run',
             ], package.path),
           ),
@@ -500,7 +494,6 @@ void main() {
             ProcessCall('dart', const <String>[
               'pub',
               'publish',
-              '--',
               '--dry-run',
             ], package.directory.path),
           ]),