[tool] Add config options needed by core-packages

script/tool/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.14.1
+
+* Adds `min_dart` as an alternative to `min_flutter` in tool configuration.
+* Makes .ci.yaml optional if batched release is not used.
+
 ## 0.14.0
 
 * Re-launches the published version of the tool for use in

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

@@ -63,6 +63,19 @@ String? getMinFlutterVersion(Directory repoRoot) {
   return yaml;
 }
 
+/// Returns the minimum Dart version allowed.
+String? getMinDartVersion(Directory repoRoot) {
+  final Object? yaml = _getToolConfig(repoRoot)['min_dart'];
+  if (yaml == null) {
+    return null;
+  }
+  if (yaml is! String) {
+    printError('min_dart must be a full version string (e.g., "3.10.0").');
+    throw ToolExit(exitInvalidArguments);
+  }
+  return yaml;
+}
+
 /// Returns the allowed dependencies, grouped by 'pinned' and 'unpinned'.
 ({List<String> pinned, List<String> unpinned}) getAllowedDependencies(
   Directory repoRoot,

script/tool/lib/src/validate_command.dart

@@ -5,6 +5,7 @@
 import 'package:file/file.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
+import 'package:pub_semver/pub_semver.dart';
 
 import 'common/core.dart';
 import 'common/git_version_finder.dart';
@@ -19,6 +20,9 @@ import 'validators/readme_validator.dart';
 import 'validators/repo_info_validator.dart';
 import 'validators/version_and_changelog_validator.dart';
 
+const int _missingMinSdkVersionExitCode = 3;
+const int _unknownVersionMappingExitCode = 4;
+
 /// The set of possible validators.
 ///
 /// Exposed for testing so that unit tests can target a single validator's
@@ -113,7 +117,10 @@ class ValidateCommand extends PackageLoopingCommand {
   );
 
   /// The minimum version of Flutter that is allowed for any package.
-  late final String _minMinFlutterVersion;
+  Version? _minMinFlutterVersion;
+
+  /// The minimum version of Dart that is allowed for any package.
+  Version? _minMinDartVersion;
 
   @override
   final String name = 'validate';
@@ -149,7 +156,20 @@ class ValidateCommand extends PackageLoopingCommand {
     }
     if (_shouldRun(Validator.pubspec)) {
       await _loadAllowedDependencies();
-      _minMinFlutterVersion = _loadMinMinFlutterVersion();
+      final (flutter: Version? minFlutter, dart: Version? minDart) =
+          _loadMinMinSdkVersions();
+      _minMinFlutterVersion = minFlutter;
+      _minMinDartVersion =
+          minDart ??
+          (minFlutter == null ? null : getDartSdkForFlutterSdk(minFlutter));
+      if (_minMinDartVersion == null) {
+        printError(
+          'Dart SDK version for Flutter SDK version $_minMinFlutterVersion is unknown. '
+          'Please update the map for getDartSdkForFlutterSdk with the '
+          'corresponding Dart version.',
+        );
+        throw ToolExit(_unknownVersionMappingExitCode);
+      }
     }
     if (_shouldRun(Validator.dependabot)) {
       _dependabotCoverage = DependabotValidator.loadConfig(repoRoot: _repoRoot);
@@ -220,6 +240,7 @@ class ValidateCommand extends PackageLoopingCommand {
       allowedPackages: _allowedPackages,
       repoRoot: rootDir,
       minMinFlutterVersion: _minMinFlutterVersion,
+      minMinDartVersion: _minMinDartVersion,
     );
     return validator.validatePubspec(package);
   }
@@ -323,13 +344,20 @@ class ValidateCommand extends PackageLoopingCommand {
     _allowedPackages.pinned.addAll(allowedDeps.pinned);
   }
 
-  String _loadMinMinFlutterVersion() {
-    final String? minVersion = getMinFlutterVersion(_repoRoot);
-    if (minVersion == null) {
-      printError('min_flutter is missing in $configFilename');
-      return '';
+  ({Version? flutter, Version? dart}) _loadMinMinSdkVersions() {
+    final String? minFlutter = getMinFlutterVersion(_repoRoot);
+    final String? minDart = getMinDartVersion(_repoRoot);
+    if (minFlutter == null && minDart == null) {
+      printError(
+        'Either min_flutter or min_dart must be provided '
+        'in the repo tool configuration.',
+      );
+      throw ToolExit(_missingMinSdkVersionExitCode);
     }
-    return minVersion.trim();
+    return (
+      flutter: minFlutter == null ? null : Version.parse(minFlutter),
+      dart: minDart == null ? null : Version.parse(minDart),
+    );
   }
 
   Pubspec? _tryParsePubspec(String pubspecContents) {

script/tool/lib/src/validators/pubspec_validator.dart

@@ -65,20 +65,23 @@ class PubspecValidator {
     required AllowPackageLists allowedPackages,
     required void Function(String) warningLogger,
     required Directory repoRoot,
-    required String minMinFlutterVersion,
+    Version? minMinFlutterVersion,
+    Version? minMinDartVersion,
   }) : _path = path,
        _indentation = indentation,
        _allowedPackages = allowedPackages,
        _logWarning = warningLogger,
        _repoRoot = repoRoot,
-       _minMinFlutterVersion = minMinFlutterVersion;
+       _minMinFlutterVersion = minMinFlutterVersion,
+       _minMinDartVersion = minMinDartVersion;
 
   final path.Context _path;
   final String _indentation;
   final AllowPackageLists _allowedPackages;
   final void Function(String) _logWarning;
   final Directory _repoRoot;
-  final String _minMinFlutterVersion;
+  final Version? _minMinFlutterVersion;
+  final Version? _minMinDartVersion;
 
   /// Validates that the pubspec of a package follows repository conventions,
   /// returning a list of errors.
@@ -115,9 +118,6 @@ class PubspecValidator {
     final String? minVersionError = _checkForMinimumVersionError(
       pubspec,
       package,
-      minMinFlutterVersion: _minMinFlutterVersion.isEmpty
-          ? null
-          : Version.parse(_minMinFlutterVersion),
     );
     if (minVersionError != null) {
       printError('$_indentation$minVersionError');
@@ -423,24 +423,8 @@ class PubspecValidator {
   /// Returns an error string if validation fails.
   String? _checkForMinimumVersionError(
     Pubspec pubspec,
-    RepositoryPackage package, {
-    Version? minMinFlutterVersion,
-  }) {
-    String unknownDartVersionError(Version flutterVersion) {
-      return 'Dart SDK version for Flutter SDK version '
-          '$flutterVersion is unknown. '
-          'Please update the map for getDartSdkForFlutterSdk with the '
-          'corresponding Dart version.';
-    }
-
-    Version? minMinDartVersion;
-    if (minMinFlutterVersion != null) {
-      minMinDartVersion = getDartSdkForFlutterSdk(minMinFlutterVersion);
-      if (minMinDartVersion == null) {
-        return unknownDartVersionError(minMinFlutterVersion);
-      }
-    }
-
+    RepositoryPackage package,
+  ) {
     final Version? dartConstraintMin = _minimumForConstraint(
       pubspec.environment['sdk'],
     );
@@ -449,19 +433,19 @@ class PubspecValidator {
     );
 
     // Validate the Flutter constraint, if any.
-    if (flutterConstraintMin != null && minMinFlutterVersion != null) {
-      if (flutterConstraintMin < minMinFlutterVersion) {
+    if (flutterConstraintMin != null && _minMinFlutterVersion != null) {
+      if (flutterConstraintMin < _minMinFlutterVersion) {
         return 'Minimum allowed Flutter version $flutterConstraintMin is less '
-            'than $minMinFlutterVersion';
+            'than $_minMinFlutterVersion';
       }
     }
 
     // Validate the Dart constraint, if any.
     if (dartConstraintMin != null) {
       // Ensure that it satisfies the minimum.
-      if (minMinDartVersion != null) {
-        if (dartConstraintMin < minMinDartVersion) {
-          return 'Minimum allowed Dart version $dartConstraintMin is less than $minMinDartVersion';
+      if (_minMinDartVersion != null) {
+        if (dartConstraintMin < _minMinDartVersion) {
+          return 'Minimum allowed Dart version $dartConstraintMin is less than $_minMinDartVersion';
         }
       }
 
@@ -471,7 +455,10 @@ class PubspecValidator {
           flutterConstraintMin,
         );
         if (dartVersionForFlutterMinimum == null) {
-          return unknownDartVersionError(flutterConstraintMin);
+          return 'Dart SDK version for Flutter SDK version '
+              '$flutterConstraintMin is unknown. '
+              'Please update the map for getDartSdkForFlutterSdk with the '
+              'corresponding Dart version.';
         }
         if (dartVersionForFlutterMinimum != dartConstraintMin) {
           return 'The minimum Dart version is $dartConstraintMin, but the '

script/tool/lib/src/validators/repo_info_validator.dart

@@ -428,6 +428,17 @@ class RepoInfoValidator {
   }) {
     final errors = <String>[];
     final File ciYamlFile = repoRoot.childFile('.ci.yaml');
+    if (!ciYamlFile.existsSync()) {
+      if (isBatchRelease) {
+        printError(
+          '${_indentation}Batched release is currently only supported for '
+          'repos using .ci.yaml',
+        );
+        errors.add('Missing .ci.yaml');
+      }
+      return errors;
+    }
+
     final String content = ciYamlFile.readAsStringSync();
     final yaml = loadYaml(content) as YamlMap;
 

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.0
+version: 0.14.1
 
 dependencies:
   args: ^2.1.0

script/tool/test/util.dart

@@ -598,6 +598,7 @@ void setToolConfig(
   Directory repoRoot, {
   String repoName = 'flutter/packages',
   String? minFlutterVersion,
+  String? minDartVersion,
   List<String>? pinnedDependencies,
   List<String>? unpinnedDependencies,
   Map<String, String>? packageLabels,
@@ -606,6 +607,9 @@ void setToolConfig(
   if (minFlutterVersion != null) {
     editor.update(['min_flutter'], minFlutterVersion);
   }
+  if (minDartVersion != null) {
+    editor.update(['min_dart'], minDartVersion);
+  }
   if (pinnedDependencies != null || unpinnedDependencies != null) {
     const allowedDependenciesKey = 'allowed_dependencies';
     const pinnedKey = 'pinned';