Migrate to new commands for Dart 2.10+

Author: kevmoo

.github/workflows/dart.yml

@@ -4,7 +4,7 @@ language: dart
 jobs:
   include:
     - stage: smoke_test
-      name: "Dart dev; PKGS: mono_repo, test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart dev; PKGS: mono_repo, test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: dev
       os: linux
       env: PKGS="mono_repo test_pkg"
@@ -16,85 +16,85 @@ jobs:
       env: PKGS="mono_repo"
       script: tool/ci.sh command
     - stage: smoke_test
-      name: "Dart 2.12.0; PKG: mono_repo; `dartanalyzer .`"
+      name: "Dart 2.12.0; PKG: mono_repo; `dart analyze`"
       dart: "2.12.0"
       os: linux
       env: PKGS="mono_repo"
       script: tool/ci.sh dartanalyzer_1
     - stage: smoke_test
-      name: "Dart 2.10.4; PKG: test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart 2.10.4; PKG: test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: "2.10.4"
       os: linux
       env: PKGS="test_pkg"
       script: tool/ci.sh dartfmt dartanalyzer_0
     - stage: smoke_test
-      name: "Dart 2.12.0-259.0.dev; PKG: test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart 2.12.0-259.0.dev; PKG: test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: "2.12.0-259.0.dev"
       os: linux
       env: PKGS="test_pkg"
       script: tool/ci.sh dartfmt dartanalyzer_0
     - stage: smoke_test
-      name: "Dart 2.12.0-29.10.beta; PKG: test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart 2.12.0-29.10.beta; PKG: test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: "2.12.0-29.10.beta"
       os: linux
       env: PKGS="test_pkg"
       script: tool/ci.sh dartfmt dartanalyzer_0
     - stage: smoke_test
-      name: "Dart main; PKG: test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart main; PKG: test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: be/raw/latest
       os: linux
       env: PKGS="test_pkg"
       script: tool/ci.sh dartfmt dartanalyzer_0
     - stage: smoke_test
-      name: "Dart beta; PKG: test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart beta; PKG: test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: beta
       os: linux
       env: PKGS="test_pkg"
       script: tool/ci.sh dartfmt dartanalyzer_0
     - stage: smoke_test
-      name: "Dart stable; PKG: test_pkg; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+      name: "Dart stable; PKG: test_pkg; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
       dart: stable
       os: linux
       env: PKGS="test_pkg"
       script: tool/ci.sh dartfmt dartanalyzer_0
     - stage: unit_test
-      name: "Dart 2.12.0; PKG: mono_repo; `pub run test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
+      name: "Dart 2.12.0; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
       dart: "2.12.0"
       os: linux
       env: PKGS="mono_repo"
       script: tool/ci.sh test_0
     - stage: unit_test
-      name: "Dart 2.12.0; PKG: mono_repo; `pub run test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
+      name: "Dart 2.12.0; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
       dart: "2.12.0"
       os: windows
       env: PKGS="mono_repo"
       script: tool/ci.sh test_0
     - stage: unit_test
-      name: "Dart dev; PKG: mono_repo; `pub run test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
+      name: "Dart dev; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
       dart: dev
       os: linux
       env: PKGS="mono_repo"
       script: tool/ci.sh test_0
     - stage: unit_test
-      name: "Dart dev; PKG: mono_repo; `pub run test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
+      name: "Dart dev; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`"
       dart: dev
       os: windows
       env: PKGS="mono_repo"
       script: tool/ci.sh test_0
     - stage: unit_test
-      name: "Dart 2.12.0; PKG: mono_repo; `pub run test -t yaml --test-randomize-ordering-seed=random`"
+      name: "Dart 2.12.0; PKG: mono_repo; `dart test -t yaml --test-randomize-ordering-seed=random`"
       dart: "2.12.0"
       os: linux
       env: PKGS="mono_repo"
       script: tool/ci.sh test_1
     - stage: unit_test
-      name: "Dart dev; PKG: mono_repo; `pub run test -t yaml --test-randomize-ordering-seed=random`"
+      name: "Dart dev; PKG: mono_repo; `dart test -t yaml --test-randomize-ordering-seed=random`"
       dart: dev
       os: linux
       env: PKGS="mono_repo"
       script: tool/ci.sh test_1
     - stage: unit_test
-      name: "Dart dev; PKG: test_pkg; `pub run test --test-randomize-ordering-seed=random`"
+      name: "Dart dev; PKG: test_pkg; `dart test --test-randomize-ordering-seed=random`"
       dart: dev
       os: linux
       env: PKGS="test_pkg"

.travis.yml

@@ -4,6 +4,7 @@
 - Drop `--no-precompile` as the default for `pub` `get` and `upgrade` commands.
   It's now the default across Dart tools.
 - Use latest `actions/cache@v2.1.6`.
+- Migrate to new command pattern supported in Dart 2.10+
 
 ## 4.0.0
 

mono_repo/CHANGELOG.md

@@ -35,7 +35,7 @@ Available commands:
   check       Check the state of the repository.
   generate    Generates the CI configuration for child packages.
   presubmit   Run the CI presubmits locally.
-  pub         Run `pub get` or `pub upgrade` against all packages.
+  pub         Run `dart pub get` or `dart pub upgrade` against all packages.
   travis      (Deprecated, use `generate`) Configure Travis-CI for child packages.
 
 Run "mono_repo help <command>" for more information about a command.

mono_repo/README.md

@@ -35,8 +35,8 @@ String get _pkgVersion => _isTesting ? '1.2.3' : packageVersion;
 const selfValidateJobName = 'mono_repo self validate';
 
 final selfValidateCommands = [
-  'pub global activate mono_repo $_pkgVersion',
-  'pub global run mono_repo generate --validate',
+  'dart pub global activate mono_repo $_pkgVersion',
+  'dart pub global run mono_repo generate --validate',
 ];
 
 class CIJobEntry {

mono_repo/lib/src/ci_shared.dart

@@ -31,7 +31,7 @@ function $commandName() {
     if [[ \$TRAVIS_OS_NAME == "windows" ]]; then
       command pub.bat "\$@"
     else
-      command pub "\$@"
+      command dart pub "\$@"
     fi
   fi
 }''';
@@ -76,11 +76,11 @@ for PKG in \${PKGS}; do
     exit 64
   fi
 
-  pub $pubDependencyCommand || EXIT_CODE=\$?
+  dart pub $pubDependencyCommand || EXIT_CODE=\$?
 
   if [[ \${EXIT_CODE} -ne 0 ]]; then
-    ${echoWithEvaluation(prettyAnsi, red, "PKG: \${PKG}; 'pub $pubDependencyCommand' - FAILED  (\${EXIT_CODE})")}
-    FAILURES+=("\${PKG}; 'pub $pubDependencyCommand'")
+    ${echoWithEvaluation(prettyAnsi, red, "PKG: \${PKG}; 'dart pub $pubDependencyCommand' - FAILED  (\${EXIT_CODE})")}
+    FAILURES+=("\${PKG}; 'dart pub $pubDependencyCommand'")
   else
     for TASK in "\$@"; do
       EXIT_CODE=0

mono_repo/lib/src/ci_test_script.dart

@@ -23,7 +23,7 @@ class PubCommand extends Command<void> {
 
   @override
   String get description =>
-      'Run `pub get` or `pub upgrade` against all packages.';
+      'Run `dart pub get` or `dart pub upgrade` against all packages.';
 }
 
 const _offline = 'offline';
@@ -53,7 +53,7 @@ class _PubSubCommand extends MonoRepoCommand {
   }
 
   @override
-  String get description => 'Run `pub $name` against all packages.';
+  String get description => 'Run `dart pub $name` against all packages.';
 
   @override
   Future<void> run() => pub(
@@ -89,8 +89,12 @@ Future<void> pub(
     args.add('--$_precompile');
   }
 
-  print(lightBlue.wrap(
-      'Running `pub ${args.join(' ')}` across ${pkgDirs.length} package(s).'));
+  print(
+    lightBlue.wrap(
+      'Running `dart pub ${args.join(' ')}` across ${pkgDirs.length} '
+      'package(s).',
+    ),
+  );
 
   for (var config in rootConfig) {
     final dir = config.relativePath;

mono_repo/lib/src/commands/pub.dart

@@ -285,7 +285,7 @@ class Task {
 
   final String command;
 
-  Task(this.name, {this.args}) : command = _commandValue(name, args);
+  Task(this.name, {this.args}) : command = _commandValue(name, args).join(' ');
 
   /// Parses an individual item under `stages`, which might be a `group` or an
   /// individual task.
@@ -393,27 +393,24 @@ class Task {
 
   Map<String, dynamic> toJson() => _$TaskToJson(this);
 
-  static String _commandValue(String name, String? args) {
+  static List<String> _commandValue(String name, String? args) {
     switch (name) {
       case 'dartfmt':
-        if (args == null || args == 'sdk') {
-          return 'dartfmt -n --set-exit-if-changed .';
-        }
-        return 'dartfmt $args';
+        return [
+          'dart format',
+          (args == null || args == 'sdk')
+              ? '--output=none --set-exit-if-changed .'
+              : args,
+        ];
       case 'dartanalyzer':
-        if (args == null) {
-          return 'dartanalyzer .';
-        }
-        return 'dartanalyzer $args';
-
+        return ['dart analyze', if (args != null) args];
       case 'test':
-        var value = 'pub run test';
-        if (args != null) {
-          value = '$value $args';
-        }
-        return value;
+        return [
+          'dart test',
+          if (args != null) args,
+        ];
       case 'command':
-        return args!;
+        return [args!];
       default:
         throw UnsupportedError('Cannot generate the command for `$name`.');
     }