More bootstrap cleanup. (#4152)

Author: davidmorgan

build_runner/lib/src/build_script_generate/bootstrap.dart

@@ -9,7 +9,6 @@ import 'dart:isolate';
 import 'package:build_runner_core/build_runner_core.dart';
 import 'package:frontend_server_client/frontend_server_client.dart';
 import 'package:io/io.dart';
-import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 import 'package:stack_trace/stack_trace.dart';
 
@@ -28,20 +27,8 @@ import 'build_script_generate.dart';
 Future<int> generateAndRun(
   List<String> args, {
   List<String>? experiments,
-  Logger? logger,
   String? script,
-}) {
-  return buildLog.runWithLoggerDisplay(
-    logger,
-    () => _generateAndRun(args, experiments, script),
-  );
-}
-
-Future<int> _generateAndRun(
-  List<String> args,
-  List<String>? experiments,
-  String? script,
-) async {
+}) async {
   experiments ??= [];
   ReceivePort? exitPort;
   ReceivePort? errorPort;

build_runner/lib/src/build_script_generate/build_script_generate.dart

@@ -72,44 +72,16 @@ ${library.accept(emitter)}
   }
 }
 
-/// Finds expressions to create all the `BuilderApplication` instances that
-/// should be applied packages in the build.
-///
-/// Adds `apply` expressions based on the BuildefDefinitions from any package
-/// which has a `build.yaml`.
-///
-/// Optionally, a custom [packageGraph] and [buildConfigOverrides] can be used
-/// to change which packages and build configurations are considered.
-/// By default, the [PackageGraph.forThisPackage] will be used and configuration
-/// overrides will be loaded from the root package.
-Future<Iterable<Expression>> findBuilderApplications({
-  PackageGraph? packageGraph,
-  Map<String, BuildConfig>? buildConfigOverrides,
-}) async {
-  final info = await findBuildScriptOptions(
-    packageGraph: packageGraph,
-    buildConfigOverrides: buildConfigOverrides,
-  );
-  return info.builderApplications;
-}
-
-Future<BuildScriptInfo> findBuildScriptOptions({
-  PackageGraph? packageGraph,
-  Map<String, BuildConfig>? buildConfigOverrides,
-}) async {
-  packageGraph ??= await PackageGraph.forThisPackage();
+Future<BuildScriptInfo> findBuildScriptOptions() async {
+  final packageGraph = await PackageGraph.forThisPackage();
   final orderedPackages = stronglyConnectedComponents<PackageNode>(
     [packageGraph.root],
     (node) => node.dependencies,
     equals: (a, b) => a.name == b.name,
     hashCode: (n) => n.name.hashCode,
   ).expand((c) => c);
   var reader = ReaderWriter(packageGraph);
-  var overrides =
-      buildConfigOverrides ??= await findBuildConfigOverrides(
-        packageGraph,
-        reader,
-      );
+  var overrides = await findBuildConfigOverrides(packageGraph, reader);
   Future<BuildConfig> packageBuildConfig(PackageNode package) async {
     if (overrides.containsKey(package.name)) {
       return overrides[package.name]!;
@@ -141,7 +113,7 @@ Future<BuildScriptInfo> findBuildScriptOptions({
       // Make sure package is known in packageGraph (when present),
       // otherwise PackageNotFoundException will be thrown down the road
       final pkg = AssetId.resolve(Uri.parse(import)).package;
-      if (packageGraph?.allPackages.containsKey(pkg) ?? true) {
+      if (packageGraph.allPackages.containsKey(pkg)) {
         return true;
       }
       buildLog.warning(
@@ -152,7 +124,7 @@ Future<BuildScriptInfo> findBuildScriptOptions({
       return false;
     }
     // ignore: avoid_dynamic_calls
-    return definition.package == packageGraph!.root.name;
+    return definition.package == packageGraph.root.name;
   }
 
   final orderedConfigs = await Future.wait(

build_runner/test/build_script_generate/experiments_test.dart

@@ -7,13 +7,10 @@
 library;
 
 import 'package:build_runner/src/build_script_generate/bootstrap.dart';
-import 'package:logging/logging.dart';
 import 'package:test/test.dart';
 
 void main() {
   test('build scripts can use experiments', () async {
-    final logger = Logger.detached('test')..level = Level.ALL;
-    logger.onRecord.listen((r) => printOnFailure(r.message));
     final exitCode = await generateAndRun(
       [],
       experiments: ['records'],
@@ -30,7 +27,6 @@ void main() {
                 buildProcessState.send(sendPort);
               }
               ''',
-      logger: logger,
     );
     expect(exitCode, 2);
   });

build_runner_core/lib/src/logging/build_log.dart

@@ -2,13 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
 import 'dart:math';
 
 import 'package:build/build.dart' show AssetId;
 // ignore: implementation_imports
 import 'package:build_runner/src/internal.dart';
-import 'package:logging/logging.dart';
 
 import '../generate/phase.dart';
 import 'ansi_buffer.dart';
@@ -148,36 +146,6 @@ class BuildLog {
   BuildLogLogger loggerForOther(String context) =>
       BuildLogLogger(context: context);
 
-  /// Runs [function] with all output sent to [logger] instead of the default
-  /// display.
-  ///
-  /// If [logger] is `null`, just runs [function].
-  Future<T> runWithLoggerDisplay<T>(
-    Logger? logger,
-    Future<T> Function() function,
-  ) async {
-    final previousOnLog = configuration.onLog;
-    if (logger != null) {
-      configuration = configuration.rebuild((b) {
-        b.onLog =
-            (record) => logger.log(
-              record.level,
-              record.message,
-              record.error,
-              record.stackTrace,
-              record.zone,
-            );
-      });
-    }
-    try {
-      return await function();
-    } finally {
-      if (logger != null) {
-        configuration = configuration.rebuild((b) => b..onLog = previousOnLog);
-      }
-    }
-  }
-
   /// Logs why `build_runner` needs to do a full build.
   ///
   /// The reason will be displayed when [startBuild] is called.