From c6bf07fd303fe796638c9f6b03cc22d8bc247da2 Mon Sep 17 00:00:00 2001 From: VGV Bot Date: Mon, 30 Jun 2025 08:13:34 +0000 Subject: [PATCH 1/4] chore: update SPDX licenses --- lib/src/cli/cli.dart | 5 +- lib/src/cli/dart_cli.dart | 4 +- lib/src/cli/flutter_cli.dart | 69 ++++++++----------- lib/src/cli/git_cli.dart | 15 ++-- lib/src/command_runner.dart | 17 ++--- .../create/commands/create_subcommand.dart | 4 +- .../packages/commands/check/check.dart | 8 +-- .../commands/check/commands/licenses.dart | 39 ++++------- lib/src/commands/test/test.dart | 6 +- lib/src/commands/update.dart | 8 +-- lib/src/pub_license/spdx_license.gen.dart | 21 +++++- lib/src/pubspec_lock/pubspec_lock.dart | 12 +--- tool/spdx_license/test/spdx_license.gen.dart | 3 +- 13 files changed, 88 insertions(+), 123 deletions(-) diff --git a/lib/src/cli/cli.dart b/lib/src/cli/cli.dart index 5f5a0d90f..353c71db4 100644 --- a/lib/src/cli/cli.dart +++ b/lib/src/cli/cli.dart @@ -52,10 +52,7 @@ abstract class ProcessOverrides { } /// Runs [body] in a fresh [Zone] using the provided overrides. - static R runZoned( - R Function() body, { - RunProcess? runProcess, - }) { + static R runZoned(R Function() body, {RunProcess? runProcess}) { final overrides = _ProcessOverridesScope(runProcess); return _asyncRunZoned(body, zoneValues: {_token: overrides}); } diff --git a/lib/src/cli/dart_cli.dart b/lib/src/cli/dart_cli.dart index ec1db60c3..d99a0a1d0 100644 --- a/lib/src/cli/dart_cli.dart +++ b/lib/src/cli/dart_cli.dart @@ -3,9 +3,7 @@ part of 'cli.dart'; /// Dart CLI class Dart { /// Determine whether dart is installed. - static Future installed({ - required Logger logger, - }) async { + static Future installed({required Logger logger}) async { try { await _Cmd.run('dart', ['--version'], logger: logger); return true; diff --git a/lib/src/cli/flutter_cli.dart b/lib/src/cli/flutter_cli.dart index 7b0316dd5..c2ac2ef54 100644 --- a/lib/src/cli/flutter_cli.dart +++ b/lib/src/cli/flutter_cli.dart @@ -79,22 +79,22 @@ class _CoverageMetrics { String? excludeFromCoverage, ) { final glob = excludeFromCoverage != null ? Glob(excludeFromCoverage) : null; - return records.fold<_CoverageMetrics>( - const _CoverageMetrics._(), - (current, record) { - final found = record.lines?.found ?? 0; - final hit = record.lines?.hit ?? 0; - if (glob != null && record.file != null) { - if (glob.matches(record.file!)) { - return current; - } + return records.fold<_CoverageMetrics>(const _CoverageMetrics._(), ( + current, + record, + ) { + final found = record.lines?.found ?? 0; + final hit = record.lines?.hit ?? 0; + if (glob != null && record.file != null) { + if (glob.matches(record.file!)) { + return current; } - return _CoverageMetrics._( - totalFound: current.totalFound + found, - totalHits: current.totalHits + hit, - ); - }, - ); + } + return _CoverageMetrics._( + totalFound: current.totalFound + found, + totalHits: current.totalHits + hit, + ); + }); } final int totalHits; @@ -119,9 +119,7 @@ typedef GeneratorBuilder = Future Function(MasonBundle); /// Flutter CLI class Flutter { /// Determine whether flutter is installed. - static Future installed({ - required Logger logger, - }) async { + static Future installed({required Logger logger}) async { try { await _Cmd.run('flutter', ['--version'], logger: logger); return true; @@ -213,14 +211,10 @@ class Flutter { ? '.' : '.${p.context.separator}$relativePath'; - stdout?.call( - 'Running "flutter test" in $path ...\n', - ); + stdout?.call('Running "flutter test" in $path ...\n'); if (!Directory(p.join(target.dir.absolute.path, 'test')).existsSync()) { - stdout?.call( - 'No test folder found in $path\n', - ); + stdout?.call('No test folder found in $path\n'); return ExitCode.success.code; } @@ -333,10 +327,7 @@ Future _verifyGitDependencies( await Future.wait( gitDependencies.map( - (dependency) => Git.reachable( - dependency.url, - logger: logger, - ), + (dependency) => Git.reachable(dependency.url, logger: logger), ), ); } @@ -408,13 +399,11 @@ Future _flutterTest({ Stream.periodic( const Duration(seconds: 1), (computationCount) => computationCount, - ).listen( - (tick) { - if (completer.isCompleted) return; - final timeElapsed = Duration(seconds: tick).formatted(); - stdout('$clearLine$timeElapsed ...'); - }, - ); + ).listen((tick) { + if (completer.isCompleted) return; + final timeElapsed = Duration(seconds: tick).formatted(); + stdout('$clearLine$timeElapsed ...'); + }); late final StreamSubscription subscription; late final StreamSubscription sigintWatchSubscription; @@ -429,10 +418,7 @@ Future _flutterTest({ subscription = testRunner( workingDirectory: cwd, - arguments: [ - if (collectCoverage) '--coverage', - ...?arguments, - ], + arguments: [if (collectCoverage) '--coverage', ...?arguments], runInShell: true, ).listen( (event) { @@ -586,9 +572,8 @@ String? _topGroupName(Test test, Map groups) => test.groupIDs .map((groupID) => groups[groupID]?.name) .firstWhereOrNull((groupName) => groupName?.isNotEmpty ?? false); -Future _cleanupOptimizerFile(String cwd) async => File( - p.join(cwd, 'test', _testOptimizerFileName), -).delete().ignore(); +Future _cleanupOptimizerFile(String cwd) async => + File(p.join(cwd, 'test', _testOptimizerFileName)).delete().ignore(); final int _lineLength = () { try { diff --git a/lib/src/cli/git_cli.dart b/lib/src/cli/git_cli.dart index 2339a45a3..7f96c19b3 100644 --- a/lib/src/cli/git_cli.dart +++ b/lib/src/cli/git_cli.dart @@ -21,16 +21,13 @@ Make sure the remote exists and you have the correct access rights.'''; /// Git CLI class Git { /// Determine whether the [remote] is reachable. - static Future reachable( - Uri remote, { - required Logger logger, - }) async { + static Future reachable(Uri remote, {required Logger logger}) async { try { - await _Cmd.run( - 'git', - ['ls-remote', '$remote', '--exit-code'], - logger: logger, - ); + await _Cmd.run('git', [ + 'ls-remote', + '$remote', + '--exit-code', + ], logger: logger); } on Exception catch (_) { throw UnreachableGitDependency(remote: remote); } diff --git a/lib/src/command_runner.dart b/lib/src/command_runner.dart index 29635a16d..0449385a7 100644 --- a/lib/src/command_runner.dart +++ b/lib/src/command_runner.dart @@ -27,11 +27,7 @@ class VeryGoodCommandRunner extends CompletionCommandRunner { _environment = environment ?? Platform.environment, super('very_good', '🦄 A Very Good Command-Line Interface') { argParser - ..addFlag( - 'version', - negatable: false, - help: 'Print the current version.', - ) + ..addFlag('version', negatable: false, help: 'Print the current version.') ..addFlag( 'verbose', help: 'Noisy logging, including all shell commands executed.', @@ -139,12 +135,10 @@ class VeryGoodCommandRunner extends CompletionCommandRunner { if (!isUpToDate) { _logger ..info('') - ..info( - ''' + ..info(''' ${lightYellow.wrap('Update available!')} ${lightCyan.wrap(packageVersion)} \u2192 ${lightCyan.wrap(latestVersion)} ${lightYellow.wrap('Changelog:')} ${lightCyan.wrap('https://github.com/verygoodopensource/very_good_cli/releases/tag/v$latestVersion')} -Run ${lightCyan.wrap('very_good update')} to update''', - ); +Run ${lightCyan.wrap('very_good update')} to update'''); } } on Exception catch (_) {} } @@ -152,9 +146,8 @@ Run ${lightCyan.wrap('very_good update')} to update''', void _showThankYou() { if (environment.containsKey('CI')) return; - final versionFile = File( - path.join(_configDir.path, 'version'), - )..createSync(recursive: true); + final versionFile = File(path.join(_configDir.path, 'version')) + ..createSync(recursive: true); if (versionFile.readAsStringSync() == packageVersion) return; versionFile.writeAsStringSync(packageVersion); diff --git a/lib/src/commands/create/commands/create_subcommand.dart b/lib/src/commands/create/commands/create_subcommand.dart index e2f8262df..7726cf4d4 100644 --- a/lib/src/commands/create/commands/create_subcommand.dart +++ b/lib/src/commands/create/commands/create_subcommand.dart @@ -293,9 +293,7 @@ mixin MultiTemplates on CreateSubCommand { final templateName = argResults['template'] as String? ?? defaultTemplateName; - return templates.firstWhere( - (element) => element.name == templateName, - ); + return templates.firstWhere((element) => element.name == templateName); } } diff --git a/lib/src/commands/packages/commands/check/check.dart b/lib/src/commands/packages/commands/check/check.dart index 07ea1c59a..9c4877309 100644 --- a/lib/src/commands/packages/commands/check/check.dart +++ b/lib/src/commands/packages/commands/check/check.dart @@ -8,12 +8,8 @@ import 'package:very_good_cli/src/commands/packages/commands/check/commands/comm /// {@endtemplate} class PackagesCheckCommand extends Command { /// {@macro packages_check_command} - PackagesCheckCommand({ - Logger? logger, - }) { - addSubcommand( - PackagesCheckLicensesCommand(logger: logger), - ); + PackagesCheckCommand({Logger? logger}) { + addSubcommand(PackagesCheckLicensesCommand(logger: logger)); } @override diff --git a/lib/src/commands/packages/commands/check/commands/licenses.dart b/lib/src/commands/packages/commands/check/commands/licenses.dart index 50b6d0a15..6fe65b14a 100644 --- a/lib/src/commands/packages/commands/check/commands/licenses.dart +++ b/lib/src/commands/packages/commands/check/commands/licenses.dart @@ -24,9 +24,7 @@ import 'package:very_good_cli/src/pubspec_lock/pubspec_lock.dart'; /// Overrides the [package_config.findPackageConfig] function for testing. @visibleForTesting -Future Function( - Directory directory, -)? +Future Function(Directory directory)? findPackageConfigOverride; /// Overrides the [detector.detectLicense] function for testing. @@ -72,9 +70,8 @@ typedef _BannedDependencyLicenseMap = Map>; /// {@endtemplate} class PackagesCheckLicensesCommand extends Command { /// {@macro packages_check_licenses_command} - PackagesCheckLicensesCommand({ - Logger? logger, - }) : _logger = logger ?? Logger() { + PackagesCheckLicensesCommand({Logger? logger}) + : _logger = logger ?? Logger() { argParser ..addFlag( 'ignore-retrieval-failures', @@ -102,10 +99,7 @@ class PackagesCheckLicensesCommand extends Command { 'allowed', help: 'Only allow the use of certain licenses.', ) - ..addMultiOption( - 'forbidden', - help: 'Deny the use of certain licenses.', - ) + ..addMultiOption('forbidden', help: 'Deny the use of certain licenses.') ..addMultiOption( 'skip-packages', help: 'Skip packages from having their licenses checked.', @@ -459,20 +453,17 @@ String _composeReport({ } String _composeBannedReport(_BannedDependencyLicenseMap bannedDependencies) { - final bannedDependenciesList = bannedDependencies.entries.fold( - [], - (previousValue, element) { - final dependencyName = element.key; - final dependencyLicenses = element.value; - - final text = - '$dependencyName (${link( - uri: pubLicenseUri(dependencyName), - message: dependencyLicenses.toList().stringify(), - )})'; - return previousValue..add(text); - }, - ); + final bannedDependenciesList = bannedDependencies.entries.fold([], ( + previousValue, + element, + ) { + final dependencyName = element.key; + final dependencyLicenses = element.value; + + final text = + '$dependencyName (${link(uri: pubLicenseUri(dependencyName), message: dependencyLicenses.toList().stringify())})'; + return previousValue..add(text); + }); final bannedLicenseTypes = bannedDependencies.values.fold({}, ( previousValue, licenses, diff --git a/lib/src/commands/test/test.dart b/lib/src/commands/test/test.dart index 8298e8856..de2655b65 100644 --- a/lib/src/commands/test/test.dart +++ b/lib/src/commands/test/test.dart @@ -153,11 +153,9 @@ class TestCommand extends Command { final recursive = _argResults['recursive'] as bool; if (!recursive && !pubspec.existsSync()) { - _logger.err( - ''' + _logger.err(''' Could not find a pubspec.yaml in $targetPath. -This command should be run from the root of your Flutter project.''', - ); +This command should be run from the root of your Flutter project.'''); return ExitCode.noInput.code; } diff --git a/lib/src/commands/update.dart b/lib/src/commands/update.dart index bbd168bd0..50f644f3e 100644 --- a/lib/src/commands/update.dart +++ b/lib/src/commands/update.dart @@ -11,11 +11,9 @@ import 'package:very_good_cli/src/version.dart'; /// {@endtemplate} class UpdateCommand extends Command { /// {@macro update_command} - UpdateCommand({ - required Logger logger, - PubUpdater? pubUpdater, - }) : _logger = logger, - _pubUpdater = pubUpdater ?? PubUpdater(); + UpdateCommand({required Logger logger, PubUpdater? pubUpdater}) + : _logger = logger, + _pubUpdater = pubUpdater ?? PubUpdater(); final Logger _logger; final PubUpdater _pubUpdater; diff --git a/lib/src/pub_license/spdx_license.gen.dart b/lib/src/pub_license/spdx_license.gen.dart index bce9e1518..028ce8296 100644 --- a/lib/src/pub_license/spdx_license.gen.dart +++ b/lib/src/pub_license/spdx_license.gen.dart @@ -11,7 +11,7 @@ library spdx_license; /// {@template spdx_license} -/// A list of all 681 SPDX licenses. +/// A list of all 700 SPDX licenses. /// /// These have been automatically generated from the SPDX License brick. /// {@endtemplate} @@ -63,6 +63,8 @@ enum SpdxLicense { $Artistic_1_0_Perl._('Artistic-1.0-Perl'), $Artistic_1_0_cl8._('Artistic-1.0-cl8'), $Artistic_2_0._('Artistic-2.0'), + $Artistic_dist._('Artistic-dist'), + $Aspell_RU._('Aspell-RU'), $BSD_1_Clause._('BSD-1-Clause'), $BSD_2_Clause._('BSD-2-Clause'), $BSD_2_Clause_Darwin._('BSD-2-Clause-Darwin'), @@ -71,6 +73,7 @@ enum SpdxLicense { $BSD_2_Clause_Patent._('BSD-2-Clause-Patent'), $BSD_2_Clause_Views._('BSD-2-Clause-Views'), $BSD_2_Clause_first_lines._('BSD-2-Clause-first-lines'), + $BSD_2_Clause_pkgconf_disclaimer._('BSD-2-Clause-pkgconf-disclaimer'), $BSD_3_Clause._('BSD-3-Clause'), $BSD_3_Clause_Attribution._('BSD-3-Clause-Attribution'), $BSD_3_Clause_Clear._('BSD-3-Clause-Clear'), @@ -213,6 +216,7 @@ enum SpdxLicense { $Cornell_Lossless_JPEG._('Cornell-Lossless-JPEG'), $Cronyx._('Cronyx'), $Crossword._('Crossword'), + $CryptoSwift._('CryptoSwift'), $CrystalStacker._('CrystalStacker'), $Cube._('Cube'), $D_FSL_1_0._('D-FSL-1.0'), @@ -223,6 +227,7 @@ enum SpdxLicense { $DRL_1_0._('DRL-1.0'), $DRL_1_1._('DRL-1.1'), $DSDP._('DSDP'), + $DocBook_DTD._('DocBook-DTD'), $DocBook_Schema._('DocBook-Schema'), $DocBook_Stylesheet._('DocBook-Stylesheet'), $DocBook_XML._('DocBook-XML'), @@ -248,7 +253,10 @@ enum SpdxLicense { $FSFAP_no_warranty_disclaimer._('FSFAP-no-warranty-disclaimer'), $FSFUL._('FSFUL'), $FSFULLR._('FSFULLR'), + $FSFULLRSD._('FSFULLRSD'), $FSFULLRWD._('FSFULLRWD'), + $FSL_1_1_ALv2._('FSL-1.1-ALv2'), + $FSL_1_1_MIT._('FSL-1.1-MIT'), $FTL._('FTL'), $Fair._('Fair'), $Ferguson_Twofish._('Ferguson-Twofish'), @@ -300,11 +308,13 @@ enum SpdxLicense { $GPL_3_0_or_later._('GPL-3.0-or-later'), $GPL_3_0_with_GCC_exception._('GPL-3.0-with-GCC-exception'), $GPL_3_0_with_autoconf_exception._('GPL-3.0-with-autoconf-exception'), + $Game_Programming_Gems._('Game-Programming-Gems'), $Giftware._('Giftware'), $Glide._('Glide'), $Glulxe._('Glulxe'), $Graphics_Gems._('Graphics-Gems'), $Gutmann._('Gutmann'), + $HDF5._('HDF5'), $HIDAPI._('HIDAPI'), $HP_1986._('HP-1986'), $HP_1989._('HP-1989'), @@ -458,6 +468,7 @@ enum SpdxLicense { $NPL_1_1._('NPL-1.1'), $NPOSL_3_0._('NPOSL-3.0'), $NRL._('NRL'), + $NTIA_PD._('NTIA-PD'), $NTP._('NTP'), $NTP_0._('NTP-0'), $Naumen._('Naumen'), @@ -562,11 +573,13 @@ enum SpdxLicense { $SMLNJ._('SMLNJ'), $SMPPL._('SMPPL'), $SNIA._('SNIA'), + $SOFA._('SOFA'), $SPL_1_0._('SPL-1.0'), $SSH_OpenSSH._('SSH-OpenSSH'), $SSH_short._('SSH-short'), $SSLeay_standalone._('SSLeay-standalone'), $SSPL_1_0._('SSPL-1.0'), + $SUL_1_0._('SUL-1.0'), $SWL._('SWL'), $Saxpath._('Saxpath'), $SchemeReport._('SchemeReport'), @@ -613,6 +626,8 @@ enum SpdxLicense { $Unicode_TOU._('Unicode-TOU'), $UnixCrypt._('UnixCrypt'), $Unlicense._('Unlicense'), + $Unlicense_libtelnet._('Unlicense-libtelnet'), + $Unlicense_libwhirlpool._('Unlicense-libwhirlpool'), $VOSTROM._('VOSTROM'), $VSL_1_0._('VSL-1.0'), $Vim._('Vim'), @@ -671,6 +686,8 @@ enum SpdxLicense { $gtkbook._('gtkbook'), $hdparm._('hdparm'), $iMatix._('iMatix'), + $jove._('jove'), + $libpng_1_6_35._('libpng-1.6.35'), $libpng_2_0._('libpng-2.0'), $libselinux_1_0._('libselinux-1.0'), $libtiff._('libtiff'), @@ -678,10 +695,12 @@ enum SpdxLicense { $lsof._('lsof'), $magaz._('magaz'), $mailprio._('mailprio'), + $man2html._('man2html'), $metamail._('metamail'), $mpi_permissive._('mpi-permissive'), $mpich2._('mpich2'), $mplus._('mplus'), + $ngrep._('ngrep'), $pkgconf._('pkgconf'), $pnmstitch._('pnmstitch'), $psfrag._('psfrag'), diff --git a/lib/src/pubspec_lock/pubspec_lock.dart b/lib/src/pubspec_lock/pubspec_lock.dart index 8defa832e..3ea78bd15 100644 --- a/lib/src/pubspec_lock/pubspec_lock.dart +++ b/lib/src/pubspec_lock/pubspec_lock.dart @@ -23,9 +23,7 @@ class PubspecLockParseException implements Exception { /// A representation of a pubspec.lock file. /// {@endtemplate} class PubspecLock { - const PubspecLock._({ - required this.packages, - }); + const PubspecLock._({required this.packages}); /// Parses a [PubspecLock] from a string. /// @@ -63,15 +61,11 @@ class PubspecLock { } catch (_) {} } - return PubspecLock._( - packages: UnmodifiableListView(parsedPackages), - ); + return PubspecLock._(packages: UnmodifiableListView(parsedPackages)); } /// An empty [PubspecLock]. - static PubspecLock empty = PubspecLock._( - packages: UnmodifiableListView([]), - ); + static PubspecLock empty = PubspecLock._(packages: UnmodifiableListView([])); /// All the dependencies in the pubspec.lock file. final UnmodifiableListView packages; diff --git a/tool/spdx_license/test/spdx_license.gen.dart b/tool/spdx_license/test/spdx_license.gen.dart index 43eaaf0eb..75b239fbb 100644 --- a/tool/spdx_license/test/spdx_license.gen.dart +++ b/tool/spdx_license/test/spdx_license.gen.dart @@ -11,7 +11,7 @@ library spdx_license; /// {@template spdx_license} -/// A list of all 699 SPDX licenses. +/// A list of all 700 SPDX licenses. /// /// These have been automatically generated from the SPDX License brick. /// {@endtemplate} @@ -575,6 +575,7 @@ enum SpdxLicense { $SSH_short._('SSH-short'), $SSLeay_standalone._('SSLeay-standalone'), $SSPL_1_0._('SSPL-1.0'), + $SUL_1_0._('SUL-1.0'), $SWL._('SWL'), $Saxpath._('Saxpath'), $SchemeReport._('SchemeReport'), From 648e347fc6f914524e469fe7f53306064a652c80 Mon Sep 17 00:00:00 2001 From: Marcos Sevilla Date: Mon, 30 Jun 2025 13:40:40 +0200 Subject: [PATCH 2/4] fix: lint and remove pana min score --- .github/workflows/very_good_cli.yaml | 1 - .../packages/commands/check/commands/licenses.dart | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/very_good_cli.yaml b/.github/workflows/very_good_cli.yaml index b44a206bf..1b9c666dc 100644 --- a/.github/workflows/very_good_cli.yaml +++ b/.github/workflows/very_good_cli.yaml @@ -52,5 +52,4 @@ jobs: pana: uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1 with: - min_score: 150 # Update minimum score to 160 once we have the CLI up to date. pana_version: 0.22.21 diff --git a/lib/src/commands/packages/commands/check/commands/licenses.dart b/lib/src/commands/packages/commands/check/commands/licenses.dart index 6893718db..3d90c655a 100644 --- a/lib/src/commands/packages/commands/check/commands/licenses.dart +++ b/lib/src/commands/packages/commands/check/commands/licenses.dart @@ -459,9 +459,12 @@ String _composeBannedReport(_BannedDependencyLicenseMap bannedDependencies) { ) { final dependencyName = element.key; final dependencyLicenses = element.value; + final hyperlink = link( + uri: pubLicenseUri(dependencyName), + message: dependencyLicenses.toList().stringify(), + ); - final text = - '$dependencyName (${link(uri: pubLicenseUri(dependencyName), message: dependencyLicenses.toList().stringify())})'; + final text = '$dependencyName ($hyperlink)'; return previousValue..add(text); }); final bannedLicenseTypes = bannedDependencies.values.fold({}, ( From d8855b0ee9ee063a0bd6342c180cc01d6150550d Mon Sep 17 00:00:00 2001 From: VGV Bot Date: Fri, 22 Aug 2025 08:12:43 +0000 Subject: [PATCH 3/4] chore: update SPDX licenses --- lib/src/cli/test_cli_runner.dart | 8 ++------ lib/src/pub_license/spdx_license.gen.dart | 5 ++++- tool/spdx_license/test/spdx_license.gen.dart | 5 ++++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/src/cli/test_cli_runner.dart b/lib/src/cli/test_cli_runner.dart index 42123716a..d00c1d774 100644 --- a/lib/src/cli/test_cli_runner.dart +++ b/lib/src/cli/test_cli_runner.dart @@ -407,9 +407,7 @@ Future _testCommand({ stderr('$clearLine$testName $testPath (FAILED)'); } - final timeElapsed = Duration( - milliseconds: event.time, - ).formatted(); + final timeElapsed = Duration(milliseconds: event.time).formatted(); final stats = computeStats(); final truncatedTestName = testName.toSingleLine().truncated( _lineLength - (timeElapsed.length + stats.length + 2), @@ -418,9 +416,7 @@ Future _testCommand({ } if (event is DoneTestEvent) { - final timeElapsed = Duration( - milliseconds: event.time, - ).formatted(); + final timeElapsed = Duration(milliseconds: event.time).formatted(); final stats = computeStats(); final summary = event.success ?? false ? lightGreen.wrap('All tests passed!')! diff --git a/lib/src/pub_license/spdx_license.gen.dart b/lib/src/pub_license/spdx_license.gen.dart index 8f33a40bb..b1ad16a02 100644 --- a/lib/src/pub_license/spdx_license.gen.dart +++ b/lib/src/pub_license/spdx_license.gen.dart @@ -11,7 +11,7 @@ library spdx_license; /// {@template spdx_license} -/// A list of all 701 SPDX licenses. +/// A list of all 704 SPDX licenses. /// /// These have been automatically generated from the SPDX License brick. /// {@endtemplate} @@ -88,6 +88,7 @@ enum SpdxLicense { $BSD_3_Clause_No_Nuclear_Warranty._('BSD-3-Clause-No-Nuclear-Warranty'), $BSD_3_Clause_Open_MPI._('BSD-3-Clause-Open-MPI'), $BSD_3_Clause_Sun._('BSD-3-Clause-Sun'), + $BSD_3_Clause_Tso._('BSD-3-Clause-Tso'), $BSD_3_Clause_acpica._('BSD-3-Clause-acpica'), $BSD_3_Clause_flex._('BSD-3-Clause-flex'), $BSD_4_Clause._('BSD-4-Clause'), @@ -239,6 +240,7 @@ enum SpdxLicense { $EPICS._('EPICS'), $EPL_1_0._('EPL-1.0'), $EPL_2_0._('EPL-2.0'), + $ESA_PL_weak_copyleft_2_4._('ESA-PL-weak-copyleft-2.4'), $EUDatagrid._('EUDatagrid'), $EUPL_1_0._('EUPL-1.0'), $EUPL_1_1._('EUPL-1.1'), @@ -634,6 +636,7 @@ enum SpdxLicense { $W3C._('W3C'), $W3C_19980720._('W3C-19980720'), $W3C_20150513._('W3C-20150513'), + $WTFNMFPL._('WTFNMFPL'), $WTFPL._('WTFPL'), $Watcom_1_0._('Watcom-1.0'), $Widget_Workshop._('Widget-Workshop'), diff --git a/tool/spdx_license/test/spdx_license.gen.dart b/tool/spdx_license/test/spdx_license.gen.dart index c14211476..e4291252b 100644 --- a/tool/spdx_license/test/spdx_license.gen.dart +++ b/tool/spdx_license/test/spdx_license.gen.dart @@ -11,7 +11,7 @@ library spdx_license; /// {@template spdx_license} -/// A list of all 701 SPDX licenses. +/// A list of all 704 SPDX licenses. /// /// These have been automatically generated from the SPDX License brick. /// {@endtemplate} @@ -86,6 +86,7 @@ enum SpdxLicense { $BSD_3_Clause_No_Nuclear_Warranty._('BSD-3-Clause-No-Nuclear-Warranty'), $BSD_3_Clause_Open_MPI._('BSD-3-Clause-Open-MPI'), $BSD_3_Clause_Sun._('BSD-3-Clause-Sun'), + $BSD_3_Clause_Tso._('BSD-3-Clause-Tso'), $BSD_3_Clause_acpica._('BSD-3-Clause-acpica'), $BSD_3_Clause_flex._('BSD-3-Clause-flex'), $BSD_4_Clause._('BSD-4-Clause'), @@ -237,6 +238,7 @@ enum SpdxLicense { $EPICS._('EPICS'), $EPL_1_0._('EPL-1.0'), $EPL_2_0._('EPL-2.0'), + $ESA_PL_weak_copyleft_2_4._('ESA-PL-weak-copyleft-2.4'), $EUDatagrid._('EUDatagrid'), $EUPL_1_0._('EUPL-1.0'), $EUPL_1_1._('EUPL-1.1'), @@ -630,6 +632,7 @@ enum SpdxLicense { $W3C._('W3C'), $W3C_19980720._('W3C-19980720'), $W3C_20150513._('W3C-20150513'), + $WTFNMFPL._('WTFNMFPL'), $WTFPL._('WTFPL'), $Watcom_1_0._('Watcom-1.0'), $Widget_Workshop._('Widget-Workshop'), From 1375c558f9909d1e58e75d6e46e15735fce80111 Mon Sep 17 00:00:00 2001 From: Marcos Sevilla Date: Fri, 22 Aug 2025 14:22:30 +0200 Subject: [PATCH 4/4] chore: empty commit