Skip to content

Commit 07a518d

Browse files
authored
Remove interactive prompts, delete files as if -d was passed. (#4121)
1 parent 2b2992c commit 07a518d

33 files changed

+70
-440
lines changed

_test_common/lib/test_phases.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ Future<TestBuildersResult> testPhases(
145145
var options = await BuildOptions.create(
146146
packageGraph: packageGraph,
147147
reader: environment.reader,
148-
deleteFilesByDefault: deleteFilesByDefault,
149148
skipBuildScriptCheck: true,
150149
enableLowResourcesMode: enableLowResourcesMode,
151150
logPerformanceDir: logPerformanceDir,

build/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.0.2-wip
2+
3+
- Use `build_runner_core` 9.3.0.
4+
15
## 3.0.1
26

37
- Small improvements to RAM usage.

build/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: build
2-
version: 3.0.1
2+
version: 3.0.2-wip
33
description: A package for authoring build_runner compatible code generators.
44
repository: https://github.com/dart-lang/build/tree/master/build
55
resolution: workspace
@@ -10,7 +10,7 @@ environment:
1010
dependencies:
1111
analyzer: '>=7.4.0 <9.0.0'
1212
async: ^2.5.0
13-
build_runner_core: '9.2.1'
13+
build_runner_core: '9.3.0-wip'
1414
built_collection: ^5.1.1
1515
built_value: ^8.9.5
1616
convert: ^3.0.0

build_resolvers/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.0.2-wip
2+
3+
- Use `build` 3.0.2.
4+
15
## 3.0.1
26

37
- Use `build` 3.0.1.

build_resolvers/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: build_resolvers
2-
version: 3.0.1
2+
version: 3.0.2-wip
33
description: Resolve Dart code in a Builder
44
repository: https://github.com/dart-lang/build/tree/master/build_resolvers
55
resolution: workspace
@@ -10,8 +10,8 @@ environment:
1010
dependencies:
1111
analyzer: '>=7.4.0 <9.0.0'
1212
async: ^2.5.0
13-
build: '3.0.1'
14-
build_runner_core: '9.2.1'
13+
build: '3.0.2-wip'
14+
build_runner_core: '9.3.0-wip'
1515
collection: ^1.17.0
1616
convert: ^3.1.1
1717
crypto: ^3.0.0

build_runner/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.7.0-wip
2+
3+
- Remove interactive prompts for whether to delete files.
4+
- Ignore `-d` flag: always delete files as if `-d` was passed.
5+
16
## 2.6.1
27

38
- Use `build` 3.0.1.

build_runner/lib/src/daemon/daemon_builder.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
258258
var buildOptions = await BuildOptions.create(
259259
packageGraph: packageGraph,
260260
reader: daemonEnvironment.reader,
261-
deleteFilesByDefault: daemonOptions.deleteFilesByDefault,
262261
overrideBuildConfig: overrideBuildConfig,
263262
skipBuildScriptCheck: daemonOptions.skipBuildScriptCheck,
264263
enableLowResourcesMode: daemonOptions.enableLowResourcesMode,

build_runner/lib/src/entrypoint/base_command.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,12 @@ abstract class BuildRunnerCommand extends Command<int> {
2828

2929
void _addBaseFlags(bool symlinksDefault) {
3030
argParser
31+
// No longer does anything, but accept so old usage does not fail.
3132
..addFlag(
3233
deleteFilesByDefaultOption,
33-
help:
34-
'By default, the user will be prompted to delete any files which '
35-
'already exist but were not known to be generated by this '
36-
'specific build script.\n\n'
37-
'Enabling this option skips the prompt and deletes the files. '
38-
'This should typically be used in continues integration servers '
39-
'and tests, but not otherwise.',
34+
hide: true,
4035
abbr: 'd',
4136
negatable: false,
42-
defaultsTo: false,
4337
)
4438
..addFlag(
4539
lowResourcesModeOption,

build_runner/lib/src/entrypoint/build.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class BuildCommand extends BuildRunnerCommand {
4444
var result = await build(
4545
builderApplications,
4646
buildFilters: options.buildFilters,
47-
deleteFilesByDefault: options.deleteFilesByDefault,
4847
enableLowResourcesMode: options.enableLowResourcesMode,
4948
configKey: options.configKey,
5049
buildDirs: options.buildDirs,

build_runner/lib/src/entrypoint/options.dart

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ class SharedOptions {
4646
/// unless they are an input to something matching a filter.
4747
final Set<BuildFilter> buildFilters;
4848

49-
/// By default, the user will be prompted to delete any files which already
50-
/// exist but were not generated by this specific build script.
51-
///
52-
/// This option can be set to `true` to skip this prompt.
53-
final bool deleteFilesByDefault;
54-
5549
final bool enableLowResourcesMode;
5650

5751
/// Read `build.$configKey.yaml` instead of `build.yaml`.
@@ -88,7 +82,6 @@ class SharedOptions {
8882

8983
SharedOptions._({
9084
required this.buildFilters,
91-
required this.deleteFilesByDefault,
9285
required this.enableLowResourcesMode,
9386
required this.configKey,
9487
required this.buildDirs,
@@ -109,7 +102,6 @@ class SharedOptions {
109102
Command command,
110103
) : this._(
111104
buildFilters: _parseBuildFilters(argResults, rootPackage),
112-
deleteFilesByDefault: argResults[deleteFilesByDefaultOption] as bool,
113105
enableLowResourcesMode: argResults[lowResourcesModeOption] as bool,
114106
configKey: argResults[configOption] as String?,
115107
buildDirs: {
@@ -139,7 +131,6 @@ class DaemonOptions extends WatchOptions {
139131
required super.buildFilters,
140132
required this.buildMode,
141133
required this.logRequests,
142-
required super.deleteFilesByDefault,
143134
required super.enableLowResourcesMode,
144135
required super.configKey,
145136
required super.buildDirs,
@@ -183,7 +174,6 @@ class DaemonOptions extends WatchOptions {
183174
buildFilters: buildFilters,
184175
buildMode: buildMode,
185176
logRequests: argResults[logRequestsOption] as bool,
186-
deleteFilesByDefault: argResults[deleteFilesByDefaultOption] as bool,
187177
enableLowResourcesMode: argResults[lowResourcesModeOption] as bool,
188178
configKey: argResults[configOption] as String?,
189179
buildDirs: buildDirs,
@@ -214,7 +204,6 @@ class WatchOptions extends SharedOptions {
214204
WatchOptions._({
215205
required this.usePollingWatcher,
216206
required super.buildFilters,
217-
required super.deleteFilesByDefault,
218207
required super.enableLowResourcesMode,
219208
required super.configKey,
220209
required super.buildDirs,
@@ -235,7 +224,6 @@ class WatchOptions extends SharedOptions {
235224
Command command,
236225
) : this._(
237226
buildFilters: _parseBuildFilters(argResults, rootPackage),
238-
deleteFilesByDefault: argResults[deleteFilesByDefaultOption] as bool,
239227
enableLowResourcesMode: argResults[lowResourcesModeOption] as bool,
240228
configKey: argResults[configOption] as String?,
241229
buildDirs: {
@@ -270,7 +258,6 @@ class ServeOptions extends WatchOptions {
270258
required this.logRequests,
271259
required this.serveTargets,
272260
required super.buildFilters,
273-
required super.deleteFilesByDefault,
274261
required super.enableLowResourcesMode,
275262
required super.configKey,
276263
required super.buildDirs,
@@ -349,7 +336,6 @@ class ServeOptions extends WatchOptions {
349336
buildUpdates: buildUpdates,
350337
logRequests: argResults[logRequestsOption] as bool,
351338
serveTargets: serveTargets,
352-
deleteFilesByDefault: argResults[deleteFilesByDefaultOption] as bool,
353339
enableLowResourcesMode: argResults[lowResourcesModeOption] as bool,
354340
configKey: argResults[configOption] as String?,
355341
buildDirs: buildDirs,

0 commit comments

Comments
 (0)