Skip to content

Commit 465b21c

Browse files
authored
Add --dart-define, -D to assemble, deprecate --define, -d. (flutter#172510)
Closes flutter#98593. Towards flutter#97505.
1 parent 0abc2ec commit 465b21c

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

packages/flutter_tools/lib/src/commands/assemble.dart

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,16 @@ class AssembleCommand extends FlutterCommand {
9898
'define',
9999
abbr: 'd',
100100
valueHelp: 'target=key=value',
101-
help: 'Allows passing configuration to a target, as in "--define=target=key=value".',
101+
hide: !verboseHelp,
102+
help:
103+
'DEPRECATED. Use "--dart-define" or "-D" instead for consistency.\n'
104+
'\n'
105+
'Allows passing configuration to a target, as in "--define=target=key=value".',
102106
);
107+
108+
// New -D/--dart-define (consistent across app)
109+
usesDartDefineOption();
110+
103111
argParser.addOption(
104112
'performance-measurement-file',
105113
help: 'Output individual target performance to a JSON file.',
@@ -143,7 +151,6 @@ class AssembleCommand extends FlutterCommand {
143151
'root of the current Flutter project.',
144152
);
145153
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
146-
usesDartDefineOption();
147154
argParser.addOption(
148155
'resource-pool-size',
149156
help: 'The maximum number of concurrent tasks the build system will run.',
@@ -249,7 +256,7 @@ class AssembleCommand extends FlutterCommand {
249256
.childDirectory('flutter_build'),
250257
projectDir: _flutterProject.directory,
251258
packageConfigPath: packageConfigPath(),
252-
defines: _parseDefines(stringsArg('define')),
259+
defines: _parseDefines([...stringsArg('define'), ...stringsArg('dart-define')]),
253260
inputs: _parseDefines(stringsArg('input')),
254261
cacheDir: globals.cache.getRoot(),
255262
flutterRootDir: globals.fs.directory(Cache.flutterRoot),

packages/flutter_tools/lib/src/runner/flutter_command.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,7 @@ abstract class FlutterCommand extends Command<void> {
757757
void usesDartDefineOption() {
758758
argParser.addMultiOption(
759759
FlutterOptions.kDartDefinesOption,
760+
abbr: 'D',
760761
aliases: <String>[kDartDefines], // supported for historical reasons
761762
help:
762763
'Additional key-value pairs that will be available as constants '

packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ void main() {
232232
'assemble',
233233
'--output',
234234
'Output',
235-
'--DartDefines=flutter.inspector.structuredErrors%3Dtrue',
235+
'-DartDefines=flutter.inspector.structuredErrors%3Dtrue',
236236
'debug_macos_bundle_flutter_assets',
237237
];
238238
expect(

0 commit comments

Comments
 (0)