diff --git a/lib/src/commands/create/commands/dart_cli.dart b/lib/src/commands/create/commands/dart_cli.dart index 1395e64d9..02f60d75b 100644 --- a/lib/src/commands/create/commands/dart_cli.dart +++ b/lib/src/commands/create/commands/dart_cli.dart @@ -6,10 +6,7 @@ import 'package:very_good_cli/src/commands/create/templates/templates.dart'; /// {@endtemplate} class CreateDartCLI extends CreateSubCommand with Publishable, Workspace { /// {@macro very_good_create_dart_cli_command} - CreateDartCLI({ - required super.logger, - required super.generatorFromBundle, - }) { + CreateDartCLI({required super.logger, required super.generatorFromBundle}) { argParser.addOption( 'executable-name', help: 'The CLI executable name (defaults to the project name)', diff --git a/lib/src/commands/create/commands/docs_site.dart b/lib/src/commands/create/commands/docs_site.dart index a4653e366..3a1e7b8aa 100644 --- a/lib/src/commands/create/commands/docs_site.dart +++ b/lib/src/commands/create/commands/docs_site.dart @@ -7,10 +7,7 @@ import 'package:very_good_cli/src/very_good_config/very_good_config.dart'; /// {@endtemplate} class CreateDocsSite extends CreateSubCommand with Publishable { /// {@macro very_good_create_docs_site} - CreateDocsSite({ - required super.logger, - required super.generatorFromBundle, - }) { + CreateDocsSite({required super.logger, required super.generatorFromBundle}) { argParser.addOption( 'org-name', help: 'The organization for this new project.', diff --git a/lib/src/commands/create/commands/flame_game.dart b/lib/src/commands/create/commands/flame_game.dart index 049e5e460..e881913d6 100644 --- a/lib/src/commands/create/commands/flame_game.dart +++ b/lib/src/commands/create/commands/flame_game.dart @@ -7,10 +7,7 @@ import 'package:very_good_cli/src/commands/create/templates/templates.dart'; class CreateFlameGame extends CreateSubCommand with OrgName, Publishable, Workspace { /// {@macro very_good_create_flame_game_command} - CreateFlameGame({ - required super.logger, - required super.generatorFromBundle, - }) { + CreateFlameGame({required super.logger, required super.generatorFromBundle}) { argParser.addMultiOption( 'platforms', help: diff --git a/lib/src/commands/create/create.dart b/lib/src/commands/create/create.dart index c2ed8c6c2..657e39edf 100644 --- a/lib/src/commands/create/create.dart +++ b/lib/src/commands/create/create.dart @@ -41,18 +41,12 @@ class CreateCommand extends Command { // very_good create dart_cli addSubcommand( - CreateDartCLI( - logger: logger, - generatorFromBundle: generatorFromBundle, - ), + CreateDartCLI(logger: logger, generatorFromBundle: generatorFromBundle), ); // very_good create docs_site addSubcommand( - CreateDocsSite( - logger: logger, - generatorFromBundle: generatorFromBundle, - ), + CreateDocsSite(logger: logger, generatorFromBundle: generatorFromBundle), ); // very_good create flutter_package @@ -73,10 +67,7 @@ class CreateCommand extends Command { // very_good create flame_game addSubcommand( - CreateFlameGame( - logger: logger, - generatorFromBundle: generatorFromBundle, - ), + CreateFlameGame(logger: logger, generatorFromBundle: generatorFromBundle), ); } diff --git a/lib/src/commands/dart/commands/dart_test_command.dart b/lib/src/commands/dart/commands/dart_test_command.dart index 5fe0cc6d0..bb1dcd551 100644 --- a/lib/src/commands/dart/commands/dart_test_command.dart +++ b/lib/src/commands/dart/commands/dart_test_command.dart @@ -93,10 +93,7 @@ class DartTestOptions { .expand((e) => e.split(RegExp(r'[,\s]+'))) .where((e) => e.isNotEmpty) .toList(); - final runSkipped = argResults.resolve( - 'run-skipped', - testConfig.runSkipped, - ); + final runSkipped = argResults.resolve('run-skipped', testConfig.runSkipped); final checkIgnore = argResults.resolve( 'check-ignore', testConfig.checkIgnore, diff --git a/lib/src/commands/packages/commands/get.dart b/lib/src/commands/packages/commands/get.dart index 8ab11d4b7..c44147e4c 100644 --- a/lib/src/commands/packages/commands/get.dart +++ b/lib/src/commands/packages/commands/get.dart @@ -21,19 +21,10 @@ class PackagesGetOptions { }) { final getConfig = config.packages.get; - final recursive = argResults.resolve( - 'recursive', - getConfig.recursive, - ); - final ignore = argResults.resolve>( - 'ignore', - getConfig.ignore, - ); - - return PackagesGetOptions._( - recursive: recursive, - ignore: ignore.toSet(), - ); + final recursive = argResults.resolve('recursive', getConfig.recursive); + final ignore = argResults.resolve>('ignore', getConfig.ignore); + + return PackagesGetOptions._(recursive: recursive, ignore: ignore.toSet()); } /// Whether to install dependencies recursively for all nested packages. diff --git a/lib/src/commands/test/test.dart b/lib/src/commands/test/test.dart index 3e9dd091e..bd30e21ac 100644 --- a/lib/src/commands/test/test.dart +++ b/lib/src/commands/test/test.dart @@ -50,10 +50,7 @@ class FlutterTestOptions { 'concurrency', testConfig.concurrency, ); - final collectCoverage = argResults.resolve( - 'coverage', - testConfig.coverage, - ); + final collectCoverage = argResults.resolve('coverage', testConfig.coverage); final minCoverage = argResults.resolve( 'min-coverage', testConfig.minCoverage, @@ -93,10 +90,7 @@ class FlutterTestOptions { 'update-goldens', testConfig.updateGoldens, ); - final failFast = argResults.resolve( - 'fail-fast', - testConfig.failFast, - ); + final failFast = argResults.resolve('fail-fast', testConfig.failFast); final forceAnsi = argResults['force-ansi'] as bool?; final dartDefine = argResults.resolve?>( 'dart-define', @@ -119,18 +113,9 @@ class FlutterTestOptions { .where((e) => e.isNotEmpty) .toList(); - final runSkipped = argResults.resolve( - 'run-skipped', - testConfig.runSkipped, - ); - final flavor = argResults.resolve( - 'flavor', - testConfig.flavor, - ); - final timeout = argResults.resolve( - 'timeout', - testConfig.timeout, - ); + final runSkipped = argResults.resolve('run-skipped', testConfig.runSkipped); + final flavor = argResults.resolve('flavor', testConfig.flavor); + final timeout = argResults.resolve('timeout', testConfig.timeout); final timeoutSeconds = int.tryParse(timeout ?? ''); final effectiveTimeout = timeoutSeconds != null ? Duration(seconds: timeoutSeconds) diff --git a/lib/src/commands/update.dart b/lib/src/commands/update.dart index 3b4f754fc..079bd3f7e 100644 --- a/lib/src/commands/update.dart +++ b/lib/src/commands/update.dart @@ -11,10 +11,8 @@ import 'package:very_good_cli/src/version.dart'; /// {@endtemplate} class UpdateCommand extends Command { /// {@macro update_command} - UpdateCommand({ - required this._logger, - PubUpdater? pubUpdater, - }) : _pubUpdater = pubUpdater ?? PubUpdater(); + UpdateCommand({required this._logger, PubUpdater? pubUpdater}) + : _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 c28a59bd6..1b0efef18 100644 --- a/lib/src/pub_license/spdx_license.gen.dart +++ b/lib/src/pub_license/spdx_license.gen.dart @@ -12,7 +12,7 @@ library spdx_license; /// {@template spdx_license} -/// A list of all 730 SPDX licenses. +/// A list of all 734 SPDX licenses. /// /// These have been automatically generated from the SPDX License brick. /// {@endtemplate} @@ -125,6 +125,7 @@ enum SpdxLicense { $Brian_Gladman_3_Clause._('Brian-Gladman-3-Clause'), $Brian_Gladman_3_Clause_no_conversion._('Brian-Gladman-3-Clause-no-conversion'), $Buddy._('Buddy'), + $Bugroff._('Bugroff'), $C_UDA_1_0._('C-UDA-1.0'), $CAL_1_0._('CAL-1.0'), $CAL_1_0_Combined_Work_Exception._('CAL-1.0-Combined-Work-Exception'), @@ -147,6 +148,7 @@ enum SpdxLicense { $CC_BY_NC_2_5._('CC-BY-NC-2.5'), $CC_BY_NC_3_0._('CC-BY-NC-3.0'), $CC_BY_NC_3_0_DE._('CC-BY-NC-3.0-DE'), + $CC_BY_NC_3_0_IGO._('CC-BY-NC-3.0-IGO'), $CC_BY_NC_4_0._('CC-BY-NC-4.0'), $CC_BY_NC_ND_1_0._('CC-BY-NC-ND-1.0'), $CC_BY_NC_ND_2_0._('CC-BY-NC-ND-2.0'), @@ -370,6 +372,7 @@ enum SpdxLicense { $ImageMagick._('ImageMagick'), $Imlib2._('Imlib2'), $Info_ZIP._('Info-ZIP'), + $Informatica._('Informatica'), $Inner_Net_2_0._('Inner-Net-2.0'), $InnoSetup._('InnoSetup'), $Intel._('Intel'), @@ -686,6 +689,7 @@ enum SpdxLicense { $Zlib._('Zlib'), $any_OSI._('any-OSI'), $any_OSI_perl_modules._('any-OSI-perl-modules'), + $atc_game._('atc-game'), $bcrypt_Solar_Designer._('bcrypt-Solar-Designer'), $blessing._('blessing'), $bzip2_1_0_5._('bzip2-1.0.5'),