Skip to content

Remove mirrors. #4112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions build_runner/lib/src/daemon/daemon_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,8 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
(change) => AssetChange(AssetId.parse(change.path), change.type),
)
.toList();

if (!_buildOptions.skipBuildScriptCheck &&
_buildSeries.buildScriptUpdates!.hasBeenUpdated(
changes.map<AssetId>((change) => change.id).toSet(),
)) {
// ignore_for_file: dead_code
if (!_buildOptions.skipBuildScriptCheck && false) {
if (!_buildScriptUpdateCompleter.isCompleted) {
_buildScriptUpdateCompleter.complete();
}
Expand Down
5 changes: 2 additions & 3 deletions build_runner/lib/src/generate/watch_impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,8 @@ class WatchImpl implements BuildState {

_expectedDeletes.clear();
if (!options.skipBuildScriptCheck) {
if (build.buildScriptUpdates!.hasBeenUpdated(
mergedChanges.keys.toSet(),
)) {
// ignore_for_file: dead_code
if (false) {
_terminateCompleter.complete();
buildLog.error('Terminating builds due to build script update.');
return BuildResult(
Expand Down
161 changes: 0 additions & 161 deletions build_runner_core/lib/src/changes/build_script_updates.dart

This file was deleted.

38 changes: 4 additions & 34 deletions build_runner_core/lib/src/generate/build_definition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import '../asset/writer.dart';
import '../asset_graph/exceptions.dart';
import '../asset_graph/graph.dart';
import '../asset_graph/graph_loader.dart';
import '../changes/build_script_updates.dart';
import '../environment/build_environment.dart';
import '../logging/build_log.dart';
import '../util/constants.dart';
Expand All @@ -27,7 +26,6 @@ import 'options.dart';
// not a build definition.
class BuildDefinition {
final AssetGraph assetGraph;
final BuildScriptUpdates? buildScriptUpdates;

/// Whether this is a build starting from no previous state or outputs.
final bool cleanBuild;
Expand All @@ -39,12 +37,7 @@ class BuildDefinition {
/// the current build having an incompatible change.
final Map<AssetId, ChangeType>? updates;

BuildDefinition._(
this.assetGraph,
this.buildScriptUpdates,
this.cleanBuild,
this.updates,
);
BuildDefinition._(this.assetGraph, this.cleanBuild, this.updates);

static Future<BuildDefinition> prepareWorkspace(
BuildEnvironment environment,
Expand Down Expand Up @@ -77,7 +70,6 @@ class _Loader {
var cacheDirSources = await assetTracker.findCacheDirSources();
var internalSources = await assetTracker.findInternalSources();

BuildScriptUpdates? buildScriptUpdates;
Map<AssetId, ChangeType>? updates;
var cleanBuild = true;
if (assetGraph != null) {
Expand All @@ -90,17 +82,8 @@ class _Loader {
cacheDirSources,
internalSources,
);
buildScriptUpdates = await BuildScriptUpdates.create(
_environment.reader,
_options.packageGraph,
assetGraph,
disabled: _options.skipBuildScriptCheck,
);

var buildScriptUpdated =
!_options.skipBuildScriptCheck &&
buildScriptUpdates.hasBeenUpdated(updates.keys.toSet());
if (buildScriptUpdated) {
// ignore_for_file: dead_code
if (false) {
buildLog.fullBuildBecause(FullBuildReason.incompatibleScript);
var deletedSourceOutputs = await assetGraph.deleteOutputs(
_options.packageGraph,
Expand All @@ -115,7 +98,6 @@ class _Loader {

inputSources.removeAll(deletedSourceOutputs);
assetGraph = null;
buildScriptUpdates = null;
updates = null;
cleanBuild = true;
}
Expand All @@ -137,13 +119,6 @@ class _Loader {
buildLog.error(e.toString());
throw const CannotBuildException();
}
buildScriptUpdates = await BuildScriptUpdates.create(
_environment.reader,
_options.packageGraph,
assetGraph,
disabled: _options.skipBuildScriptCheck,
);

conflictingOutputs =
assetGraph.outputs
.where((n) => n.package == _options.packageGraph.root.name)
Expand Down Expand Up @@ -171,12 +146,7 @@ class _Loader {
await _initialBuildCleanup(conflictingOutputs, _environment.writer);
}

return BuildDefinition._(
assetGraph,
buildScriptUpdates,
cleanBuild,
updates,
);
return BuildDefinition._(assetGraph, cleanBuild, updates);
}

/// Deletes the generated output directory.
Expand Down
4 changes: 0 additions & 4 deletions build_runner_core/lib/src/generate/build_series.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'package:watcher/watcher.dart';
import '../asset/finalized_reader.dart';
import '../asset/writer.dart';
import '../asset_graph/graph.dart';
import '../changes/build_script_updates.dart';
import '../environment/build_environment.dart';
import '../logging/build_log.dart';
import '../package_graph/apply_builders.dart';
Expand All @@ -39,7 +38,6 @@ import 'options.dart';
class BuildSeries {
final BuildEnvironment environment;
final AssetGraph assetGraph;
final BuildScriptUpdates? buildScriptUpdates;
final BuildOptions options;
final BuildPhases buildPhases;

Expand All @@ -66,7 +64,6 @@ class BuildSeries {
BuildSeries._(
this.environment,
this.assetGraph,
this.buildScriptUpdates,
this.options,
this.buildPhases,
this.finalizedReader,
Expand Down Expand Up @@ -173,7 +170,6 @@ class BuildSeries {
var build = BuildSeries._(
environment,
buildDefinition.assetGraph,
buildDefinition.buildScriptUpdates,
options,
buildPhases,
finalizedReader,
Expand Down
77 changes: 0 additions & 77 deletions build_runner_core/test/changes/build_script_updates_test.dart

This file was deleted.

Loading