From 5e300f9bf5c535febe65d4d635f28ff4a236fcd0 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@gmail.com>
Date: Fri, 17 Nov 2023 11:22:13 -0800
Subject: [PATCH] refactor CI testing of dart-services (#2719)

refactor CI testing of dart-services; address several regressions
---
 .github/workflows/dart_services.yml           |  64 ++---
 .github/workflows/samples.yml                 |   1 -
 .github/workflows/sketch_pad.yml              |   2 -
 pkgs/dart_pad/web/example/embed.html          |   2 -
 pkgs/dart_services/README.md                  |   6 +-
 pkgs/dart_services/benchmark/bench.dart       | 235 ------------------
 pkgs/dart_services/benchmark/bench_impl.dart  | 121 ---------
 pkgs/dart_services/lib/server.dart            |   2 +-
 pkgs/dart_services/lib/src/common.dart        |  21 +-
 pkgs/dart_services/lib/src/compiler.dart      |  13 +-
 pkgs/dart_services/lib/src/sdk.dart           |  91 ++++---
 .../test/flutter_analysis_server_test.dart    |   3 +-
 pkgs/dart_services/test/server_v3_test.dart   |   6 +-
 .../dependencies/pub_dependencies_beta.json   |   2 +-
 .../dependencies/pub_dependencies_main.json   |   4 +-
 pkgs/dart_services/tool/grind.dart            |  65 +----
 pkgs/sketch_pad/lib/samples.g.dart            |   8 +-
 17 files changed, 136 insertions(+), 510 deletions(-)
 delete mode 100644 pkgs/dart_services/benchmark/bench.dart
 delete mode 100644 pkgs/dart_services/benchmark/bench_impl.dart

diff --git a/.github/workflows/dart_services.yml b/.github/workflows/dart_services.yml
index c7fa99cad..1e22e8605 100644
--- a/.github/workflows/dart_services.yml
+++ b/.github/workflows/dart_services.yml
@@ -12,12 +12,11 @@ on:
       - '.github/workflows/dart_services.yml'
       - 'pkgs/dart_services/**'
   schedule:
-    - cron: '0 0 * * 0' # weekly
+    - cron: '0 0 * * *' # daily
 
 jobs:
-  # Check code formatting, static analysis, and build on a single OS (linux)
-  # against Dart stable and beta.
-  analyze:
+  # Check code formatting, static analysis, and build on a single OS (linux).
+  verify:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -25,43 +24,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [stable, beta, main]
+        sdk: [stable, beta, master] # main
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: subosito/flutter-action@aa6d9b984461fff0e0e0673f96483607df98db84
-      - name: Install dependencies
+        with:
+            channel: ${{ matrix.sdk }}
+      - run: flutter --version
+
+      - name: Install apt dependencies
         run: sudo apt-get install -y protobuf-compiler redis
-      - name: Install dependencies
+
+      - name: Install dart dependencies
         run: dart pub get
-      - name: Analyze code
-        run: dart analyze --fatal-infos .
-      - name: check formatting
-        run: dart format --set-exit-if-changed lib test tool  
-      - name: Run tests
-        env:
-          FLUTTER_CHANNEL: ${{ matrix.sdk }}
-        run: |
-          export PATH=$PATH:$HOME/.pub-cache/bin
-          dart pub global activate protoc_plugin
-          dart run grinder test
 
-  # Run the benchmarks on the bots to ensure they don't regress.
-  benchmark:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: pkgs/dart_services/
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - uses: subosito/flutter-action@aa6d9b984461fff0e0e0673f96483607df98db84
-      - run: sudo apt-get install -y protobuf-compiler redis
-      - run: dart pub get
-      - name: Download the Flutter SDK
-        run: |
-          flutter doctor -v
-      - name: Prep the repo
-        env:
-          FLUTTER_CHANNEL: stable
-        run: dart run grinder buildbot
-      - name: Run benchmarks
-        run: dart benchmark/bench.dart
+      - name: Analyze project source
+        run: dart analyze --fatal-infos
+
+      - name: Verify formatting
+        run: dart format --set-exit-if-changed bin lib test tool
+
+      - name: Create template projects and populate the custom pub cache
+        run: dart run grinder build-project-templates
+
+      # Build the web artifacts on the bots to ensure they don't regress.
+      - name: Build web artifacts
+        run: dart run grinder build-storage-artifacts
+
+      - name: Run tests
+        run: dart test
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
index 1846d3a57..19166dd2a 100644
--- a/.github/workflows/samples.yml
+++ b/.github/workflows/samples.yml
@@ -30,4 +30,3 @@ jobs:
       - run: dart format --set-exit-if-changed .
       - run: dart tool/samples.dart --verify
       - run: flutter build web
-      # - run: flutter test
diff --git a/.github/workflows/sketch_pad.yml b/.github/workflows/sketch_pad.yml
index 3776427c0..ba06c5357 100644
--- a/.github/workflows/sketch_pad.yml
+++ b/.github/workflows/sketch_pad.yml
@@ -25,8 +25,6 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b
-        with:
-            channel: 'stable'
       - run: flutter pub get
       - run: flutter analyze
       - run: dart format --set-exit-if-changed .
diff --git a/pkgs/dart_pad/web/example/embed.html b/pkgs/dart_pad/web/example/embed.html
index 16414470d..7e9d5071f 100644
--- a/pkgs/dart_pad/web/example/embed.html
+++ b/pkgs/dart_pad/web/example/embed.html
@@ -78,8 +78,6 @@
     <script type="text/javascript">
 
         const testSource = `void main() async {
-  await ui.webOnlyInitializePlatform();
-
   runApp(
     MaterialApp(
       debugShowCheckedModeBanner: false,
diff --git a/pkgs/dart_services/README.md b/pkgs/dart_services/README.md
index 3ee531be3..e2c3c2561 100644
--- a/pkgs/dart_services/README.md
+++ b/pkgs/dart_services/README.md
@@ -67,11 +67,7 @@ The server will run from port 8080 and export several JSON APIs, like
 
 To run tests:
 
-`dart tool/grind.dart test`
-
-or:
-
-`grind deploy` for all tests and checks.
+`dart test`
 
 ## Redis
 
diff --git a/pkgs/dart_services/benchmark/bench.dart b/pkgs/dart_services/benchmark/bench.dart
deleted file mode 100644
index a9b823d0a..000000000
--- a/pkgs/dart_services/benchmark/bench.dart
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// 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.
-
-// ignore_for_file: only_throw_errors
-
-import 'dart:async';
-
-import 'package:dart_services/src/analysis_server.dart';
-import 'package:dart_services/src/common.dart';
-import 'package:dart_services/src/compiler.dart';
-import 'package:dart_services/src/logging.dart';
-import 'package:dart_services/src/protos/dart_services.pb.dart' as proto;
-import 'package:dart_services/src/sdk.dart';
-import 'package:logging/logging.dart';
-
-import 'bench_impl.dart';
-
-void main(List<String> args) async {
-  final json = args.contains('--json');
-  final harness = BenchmarkHarness(asJson: json);
-  final compiler = Compiler(Sdk(), storageBucket: 'nnbd_artifacts');
-
-  Logger.root.level = Level.INFO;
-  emitLogsToStdout();
-
-  final benchmarks = <Benchmark>[
-    AnalyzerBenchmark('hello', sampleCode),
-    AnalyzerBenchmark('hellohtml', sampleCodeWeb),
-    AnalyzerBenchmark('sunflower', _sunflower),
-    AnalyzerBenchmark('spinning_square', _spinningSquare),
-    AnalysisServerBenchmark('hello', sampleCode),
-    AnalysisServerBenchmark('hellohtml', sampleCodeWeb),
-    AnalysisServerBenchmark('sunflower', _sunflower),
-    AnalysisServerBenchmark('spinning_square', _spinningSquare),
-    Dart2jsBenchmark('hello', sampleCode, compiler),
-    Dart2jsBenchmark('hellohtml', sampleCodeWeb, compiler),
-    Dart2jsBenchmark('sunflower', _sunflower, compiler),
-    // TODO: dart-services dart2js compile path doesn't currently support
-    // compiling Flutter apps.
-    // Dart2jsBenchmark('spinning_square', _spinningSquare, compiler),
-    DevCompilerBenchmark('hello', sampleCode, compiler),
-    DevCompilerBenchmark('hellohtml', sampleCodeWeb, compiler),
-    DevCompilerBenchmark('sunflower', _sunflower, compiler),
-    DevCompilerBenchmark('spinning_square', _spinningSquare, compiler),
-  ];
-
-  await harness.benchmark(benchmarks);
-  await compiler.dispose();
-}
-
-class AnalyzerBenchmark extends Benchmark {
-  final String source;
-  final AnalysisServerWrapper analysisServer;
-
-  AnalyzerBenchmark(
-    String name,
-    this.source,
-  )   : analysisServer =
-            DartAnalysisServerWrapper(dartSdkPath: Sdk().dartSdkPath),
-        super('analyzer.$name');
-
-  @override
-  Future<void> init() => analysisServer.init();
-
-  @override
-  Future<proto.AnalysisResults> perform() => analysisServer.analyze(source);
-
-  @override
-  Future<dynamic> tearDown() => analysisServer.shutdown();
-}
-
-class Dart2jsBenchmark extends Benchmark {
-  final String source;
-  final Compiler compiler;
-
-  Dart2jsBenchmark(String name, this.source, this.compiler)
-      : super('dart2js.$name');
-
-  @override
-  Future<void> perform() {
-    return compiler.compile(source).then((CompilationResults result) {
-      if (!result.success) throw result;
-    });
-  }
-}
-
-class DevCompilerBenchmark extends Benchmark {
-  final String source;
-  final Compiler compiler;
-
-  DevCompilerBenchmark(String name, this.source, this.compiler)
-      : super('dartdevc.$name');
-
-  @override
-  Future<void> perform() {
-    return compiler.compileDDC(source).then((DDCCompilationResults result) {
-      if (!result.success) throw result;
-    });
-  }
-}
-
-class AnalysisServerBenchmark extends Benchmark {
-  final String source;
-  final AnalysisServerWrapper analysisServer;
-
-  AnalysisServerBenchmark(String name, this.source)
-      : analysisServer =
-            DartAnalysisServerWrapper(dartSdkPath: Sdk().dartSdkPath),
-        super('completion.$name');
-
-  @override
-  Future<void> init() => analysisServer.init();
-
-  @override
-  Future<proto.CompleteResponse> perform() =>
-      analysisServer.complete(source, 30);
-
-  @override
-  Future<dynamic> tearDown() => analysisServer.shutdown();
-}
-
-final String _sunflower = '''
-library sunflower;
-
-import 'dart:html';
-import 'dart:math' as math;
-
-main() {
-  Sunflower();
-}
-
-class Sunflower {
-  static const String orange = "orange";
-  static const seedRadius = 2;
-  static const scaleFactor = 4;
-  static const tau = math.pi * 2;
-  static const maxD = 300;
-
-  late CanvasRenderingContext2D ctx;
-  late num xc, yc;
-  num seeds = 0;
-  late num phi;
-
-  Sunflower() {
-    phi = (math.sqrt(5) + 1) / 2;
-
-    CanvasElement canvas = querySelector("#canvas") as CanvasElement;
-    xc = yc = maxD / 2;
-    ctx = canvas.getContext("2d") as CanvasRenderingContext2D;
-
-    var slider = querySelector("#slider") as InputElement;
-    slider.onChange.listen((Event e) {
-      seeds = int.parse(slider.value!);
-      drawFrame();
-    });
-
-    seeds = int.parse(slider.value!);
-
-    drawFrame();
-  }
-
-  // Draw the complete figure for the current number of seeds.
-  void drawFrame() {
-    ctx.clearRect(0, 0, maxD, maxD);
-    for (var i = 0; i < seeds; i++) {
-      var theta = i * tau / phi;
-      var r = math.sqrt(i) * scaleFactor;
-      var x = xc + r * math.cos(theta);
-      var y = yc - r * math.sin(theta);
-      drawSeed(x, y);
-    }
-  }
-
-  // Draw a small circle representing a seed centered at (x,y).
-  void drawSeed(num x, num y) {
-    ctx.beginPath();
-    ctx.lineWidth = 2;
-    ctx.fillStyle = orange;
-    ctx.strokeStyle = orange;
-    ctx.arc(x, y, seedRadius, 0, tau, false);
-    ctx.fill();
-    ctx.closePath();
-    ctx.stroke();
-  }
-}
-''';
-
-final _spinningSquare = '''
-import 'package:flutter/material.dart';
-
-class SpinningSquare extends StatefulWidget {
-  @override
-  SpinningSquareState createState() => SpinningSquareState();
-}
-
-class SpinningSquareState extends State<SpinningSquare>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _animation;
-
-  @override
-  void initState() {
-    super.initState();
-    // We use 3600 milliseconds instead of 1800 milliseconds because 0.0 -> 1.0
-    // represents an entire turn of the square whereas in the other examples
-    // we used 0.0 -> math.pi, which is only half a turn.
-    _animation = AnimationController(
-      duration: const Duration(milliseconds: 3600),
-      vsync: this,
-    )..repeat();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return RotationTransition(
-      turns: _animation,
-      child: Container(
-        width: 200.0,
-        height: 200.0,
-        color: const Color(0xFF00FF00),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _animation.dispose();
-    super.dispose();
-  }
-}
-
-main() async {
-  runApp(Center(child: SpinningSquare()));
-}
-''';
diff --git a/pkgs/dart_services/benchmark/bench_impl.dart b/pkgs/dart_services/benchmark/bench_impl.dart
deleted file mode 100644
index 83d8c75e6..000000000
--- a/pkgs/dart_services/benchmark/bench_impl.dart
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// 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.
-
-/// A benchmark library. This library supports running benchmarks which can
-/// run asynchronously.
-library;
-
-import 'dart:async';
-import 'dart:convert' show json;
-
-abstract class Benchmark {
-  final String name;
-
-  Benchmark(this.name);
-
-  Future<void> init() => Future.value();
-
-  Future<void> perform();
-
-  /// Called once when this benchmark will no longer be used.
-  Future<void> tearDown() => Future<void>.value();
-
-  @override
-  String toString() => name;
-}
-
-typedef BenchmarkLogger = void Function(String str);
-
-class BenchmarkHarness {
-  final bool asJson;
-  final BenchmarkLogger logger;
-
-  BenchmarkHarness({required this.asJson, this.logger = print});
-
-  Future<void> benchmark(List<Benchmark> benchmarks) async {
-    log('Running ${benchmarks.length} benchmarks.');
-    log('');
-
-    final results = <BenchMarkResult>[];
-
-    await Future.forEach(benchmarks, (Benchmark benchmark) => benchmark.init());
-
-    return Future.forEach(benchmarks, (Benchmark benchmark) {
-      return benchmarkSingle(benchmark).then(results.add);
-    }).then((_) {
-      if (asJson) {
-        logger(json.encode(results
-            .map((BenchMarkResult r) =>
-                <String, num>{r.benchmark.name: r.averageMilliseconds()})
-            .toList()));
-      }
-    });
-  }
-
-  Future<BenchMarkResult> benchmarkSingle(Benchmark benchmark) {
-    return _warmup(benchmark).then((_) {
-      return _measure(benchmark);
-    }).then((BenchMarkResult result) {
-      logResult(result);
-      return result;
-    }).whenComplete(() {
-      return benchmark.tearDown().catchError((dynamic e) => null);
-    });
-  }
-
-  void log(String message) {
-    if (!asJson) logger(message);
-  }
-
-  void logResult(BenchMarkResult result) {
-    if (!asJson) logger(result.toString());
-  }
-
-  Future<BenchMarkResult> _warmup(Benchmark benchmark) {
-    return _time(benchmark, 2, 1000);
-  }
-
-  Future<BenchMarkResult> _measure(Benchmark benchmark) {
-    return _time(benchmark, 10, 2000, 10000);
-  }
-
-  Future<BenchMarkResult> _time(
-      Benchmark benchmark, int minIterations, int minMillis,
-      [int? maxMillis]) {
-    final result = BenchMarkResult(benchmark);
-    final timer = Stopwatch()..start();
-
-    return Future.doWhile(() {
-      if (result.iteration >= minIterations &&
-          timer.elapsedMilliseconds >= minMillis) {
-        return false;
-      }
-
-      if (maxMillis != null && timer.elapsedMilliseconds >= maxMillis) {
-        return false;
-      }
-
-      result.iteration++;
-      return benchmark.perform().then((_) => true);
-    }).then((_) {
-      timer.stop();
-      result.microseconds = timer.elapsedMicroseconds;
-      return result;
-    });
-  }
-}
-
-class BenchMarkResult {
-  final Benchmark benchmark;
-  int iteration = 0;
-  int microseconds = 0;
-
-  BenchMarkResult(this.benchmark);
-
-  double averageMilliseconds() => (microseconds / iteration) / 1000.0;
-
-  @override
-  String toString() => '[${benchmark.name.padRight(26)}: '
-      '${averageMilliseconds().toStringAsFixed(3).padLeft(8)}ms]';
-}
diff --git a/pkgs/dart_services/lib/server.dart b/pkgs/dart_services/lib/server.dart
index be33dc108..49bfccd29 100644
--- a/pkgs/dart_services/lib/server.dart
+++ b/pkgs/dart_services/lib/server.dart
@@ -26,7 +26,7 @@ Future<void> main(List<String> args) async {
     ..addOption('storage-bucket',
         valueHelp: 'name',
         help: 'The name of the Cloud Storage bucket for compilation artifacts.',
-        defaultsTo: 'nnb_artifacts')
+        defaultsTo: 'nnbd_artifacts')
     ..addFlag('help',
         abbr: 'h', negatable: false, help: 'Show this usage information.');
 
diff --git a/pkgs/dart_services/lib/src/common.dart b/pkgs/dart_services/lib/src/common.dart
index 599454e88..54d6444a8 100644
--- a/pkgs/dart_services/lib/src/common.dart
+++ b/pkgs/dart_services/lib/src/common.dart
@@ -5,11 +5,28 @@
 const kMainDart = 'main.dart';
 const kBootstrapDart = 'bootstrap.dart';
 
-/// This code should be kept up-to-date with WebEntrypointTarget.build() from
-/// flutter_tools: https://github.com/flutter/flutter/blob/169020719bc5882e746b836629721644633b6c8a/packages/flutter_tools/lib/src/build_system/targets/web.dart#L137
+// This code should be kept up-to-date with
+// https://github.com/flutter/flutter/blob/master/packages/flutter_tools/lib/src/web/bootstrap.dart#L236.
 const kBootstrapFlutterCode = r'''
+import 'dart:ui_web' as ui_web;
+
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
+import 'generated_plugin_registrant.dart';
+import 'main.dart' as entrypoint;
+
+Future<void> main() async {
+  registerPlugins(webPluginRegistrar);
+  await ui_web.bootstrapEngine();
+  entrypoint.main();
+}
+''';
+
+const kBootstrapFlutterCode_3_16 = r'''
 import 'dart:ui' as ui;
+
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
 import 'generated_plugin_registrant.dart';
 import 'main.dart' as entrypoint;
 
diff --git a/pkgs/dart_services/lib/src/compiler.dart b/pkgs/dart_services/lib/src/compiler.dart
index a49c691f6..0e5886fc2 100644
--- a/pkgs/dart_services/lib/src/compiler.dart
+++ b/pkgs/dart_services/lib/src/compiler.dart
@@ -179,8 +179,15 @@ class Compiler {
       await Directory(path.join(temp.path, 'lib')).create(recursive: true);
 
       final bootstrapPath = path.join(temp.path, 'lib', kBootstrapDart);
-      final bootstrapContents =
-          usingFlutter ? kBootstrapFlutterCode : kBootstrapDartCode;
+      String bootstrapContents;
+      if (usingFlutter) {
+        bootstrapContents = _sdk.usesNewBootstrapEngine
+            ? kBootstrapFlutterCode
+            : kBootstrapFlutterCode_3_16;
+      } else {
+        bootstrapContents = kBootstrapDartCode;
+      }
+
       await File(bootstrapPath).writeAsString(bootstrapContents);
 
       files.forEach((filename, content) async {
@@ -195,7 +202,7 @@ class Compiler {
           '-s',
           _projectTemplates.summaryFilePath,
           '-s',
-          '${_sdk.flutterWebSdkPath}/flutter_ddc_sdk_sound.dill',
+          '${_sdk.flutterWebSdkPath}/ddc_outline_sound.dill',
         ],
         ...['-o', path.join(temp.path, '$kMainDart.js')],
         ...['--module-name', 'dartpad_main'],
diff --git a/pkgs/dart_services/lib/src/sdk.dart b/pkgs/dart_services/lib/src/sdk.dart
index c2904022e..9d0ae9d5e 100644
--- a/pkgs/dart_services/lib/src/sdk.dart
+++ b/pkgs/dart_services/lib/src/sdk.dart
@@ -2,12 +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:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
 
-const stableChannel = 'stable';
-
 class Sdk {
   /// The path to the Flutter binaries.
   late final String _flutterBinPath;
@@ -26,17 +25,17 @@ class Sdk {
   /// The current version of the SDK, not including any `-dev` suffix.
   late final String version;
 
+  // The channel for this SDK.
+  late final String channel;
+
   /// If this is the stable channel.
-  bool get stableChannel => _channel == 'stable';
+  bool get stableChannel => channel == 'stable';
 
   /// If this is the beta channel.
-  bool get betaChannel => _channel == 'beta';
+  bool get betaChannel => channel == 'beta';
 
   /// If this is the main channel.
-  bool get mainChannel => _channel == 'main';
-
-  // Which channel is this SDK?
-  String? _channel;
+  bool get mainChannel => channel == 'main';
 
   // The directory that contains this SDK
   String? _sdkPath;
@@ -60,33 +59,24 @@ class Sdk {
 
   String get sdkPath => _sdkPath ??= _getSdkPath();
 
-  String get channel {
-    _channel ??= _getChannel();
-    return _channel!;
-  }
-
-  /// Returns the Flutter channel provided in environment variables.
-  String _getChannel() {
-    return Process.runSync(
-            'git', 'rev-parse --abbrev-ref HEAD'.split(' ').toList(),
-            workingDirectory: sdkPath)
-        .stdout
-        .toString()
-        .trim();
-  }
-
   Sdk() {
-    final flutterBinPath = path.join(sdkPath, 'bin');
-    _flutterBinPath = flutterBinPath;
-    dartSdkPath = path.join(flutterBinPath, 'cache', 'dart-sdk');
+    _flutterBinPath = path.join(sdkPath, 'bin');
+
+    dartSdkPath = path.join(_flutterBinPath, 'cache', 'dart-sdk');
     dartVersion = _readVersionFile(dartSdkPath);
-    flutterVersion = _readVersionFile(sdkPath);
-    final engineVersionPath =
-        path.join(flutterBinPath, 'internal', 'engine.version');
-    engineVersion = _readFile(engineVersionPath);
     version = dartVersion.contains('-')
         ? dartVersion.substring(0, dartVersion.indexOf('-'))
         : dartVersion;
+
+    // flutter --version --machine
+    final versions = _callFlutterVersion();
+
+    flutterVersion = versions['flutterVersion'] as String;
+    engineVersion = versions['engineRevision'] as String;
+
+    // Report the 'master' channel as 'main';
+    final tempChannel = versions['channel'] as String;
+    channel = tempChannel == 'master' ? 'main' : tempChannel;
   }
 
   /// The path to the 'flutter' tool (binary).
@@ -96,10 +86,41 @@ class Sdk {
     return path.join(_flutterBinPath, 'cache', 'flutter_web_sdk', 'kernel');
   }
 
-  static String _readVersionFile(String filePath) =>
-      _readFile(path.join(filePath, 'version'));
-}
+  bool get usesNewBootstrapEngine {
+    final uiWebPackage =
+        path.join(_flutterBinPath, 'cache', 'flutter_web_sdk', 'lib', 'ui_web');
+    final initializationLibrary =
+        path.join(uiWebPackage, 'ui_web', 'initialization.dart');
 
-const channels = ['stable', 'beta', 'main'];
+    final file = File(initializationLibrary);
+    if (!file.existsSync()) return false;
 
-String _readFile(String filePath) => File(filePath).readAsStringSync().trim();
+    // Look for 'Future<void> bootstrapEngine({ ... }) { ... }'.
+    return file.readAsStringSync().contains('bootstrapEngine(');
+  }
+
+  Map<String, dynamic> _callFlutterVersion() {
+    // Note that we try twice here as the 'flutter --version --machine' command
+    // can (erroneously) emit non-json text to stdout (for example, an initial
+    // analytics disclaimer).
+
+    try {
+      return jsonDecode(Process.runSync(
+        flutterToolPath,
+        ['--version', '--machine'],
+        workingDirectory: sdkPath,
+      ).stdout.toString().trim()) as Map<String, dynamic>;
+    } on FormatException {
+      return jsonDecode(Process.runSync(
+        flutterToolPath,
+        ['--version', '--machine'],
+        workingDirectory: sdkPath,
+      ).stdout.toString().trim()) as Map<String, dynamic>;
+    }
+  }
+
+  static String _readVersionFile(String filePath) {
+    final file = File(path.join(filePath, 'version'));
+    return file.readAsStringSync().trim();
+  }
+}
diff --git a/pkgs/dart_services/test/flutter_analysis_server_test.dart b/pkgs/dart_services/test/flutter_analysis_server_test.dart
index 59e173b7a..3f503db43 100644
--- a/pkgs/dart_services/test/flutter_analysis_server_test.dart
+++ b/pkgs/dart_services/test/flutter_analysis_server_test.dart
@@ -13,7 +13,8 @@ import 'package:dart_services/src/sdk.dart';
 import 'package:dart_services/src/server_cache.dart';
 import 'package:test/test.dart';
 
-final channel = Platform.environment['FLUTTER_CHANNEL'] ?? stableChannel;
+final channel = Platform.environment['FLUTTER_CHANNEL'] ?? 'stable';
+
 void main() => defineTests();
 
 void defineTests() {
diff --git a/pkgs/dart_services/test/server_v3_test.dart b/pkgs/dart_services/test/server_v3_test.dart
index 059e3e4b5..fd6e8923d 100644
--- a/pkgs/dart_services/test/server_v3_test.dart
+++ b/pkgs/dart_services/test/server_v3_test.dart
@@ -245,7 +245,11 @@ void main() {
 
       expect(
         result.dartdoc!.toLowerCase(),
-        contains('prints a string representation'),
+        anyOf(
+          // Support both pre and post Dart 3.3.0.
+          contains('prints a string representation'),
+          contains('prints an object to the console'),
+        ),
       );
       expect(result.containingLibraryName, 'dart:core');
       expect(result.elementDescription, isNotNull);
diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json
index d431c7fe0..85acd1d14 100644
--- a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json
+++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json
@@ -84,7 +84,7 @@
   "logging": "1.2.0",
   "matcher": "0.12.16",
   "material_color_utilities": "0.5.0",
-  "meta": "1.10.0",
+  "meta": "1.11.0",
   "mgrs_dart": "2.0.0",
   "mime": "1.0.4",
   "nested": "1.0.0",
diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json
index be670b0d6..5423374d4 100644
--- a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json
+++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json
@@ -150,12 +150,12 @@
   "vector_math": "2.1.4",
   "video_player": "2.8.1",
   "video_player_android": "2.4.10",
-  "video_player_avfoundation": "2.5.1",
+  "video_player_avfoundation": "2.5.2",
   "video_player_platform_interface": "6.2.1",
   "video_player_web": "2.1.2",
   "vm_service": "13.0.0",
   "watcher": "1.1.0",
-  "web": "0.3.0",
+  "web": "0.4.0",
   "web_socket_channel": "2.4.0",
   "webkit_inspection_protocol": "1.2.1",
   "win32": "5.1.0",
diff --git a/pkgs/dart_services/tool/grind.dart b/pkgs/dart_services/tool/grind.dart
index d9af97cd4..48b353220 100644
--- a/pkgs/dart_services/tool/grind.dart
+++ b/pkgs/dart_services/tool/grind.dart
@@ -22,20 +22,6 @@ Future<void> main(List<String> args) async {
   return grind(args);
 }
 
-@Task()
-@Depends(buildProjectTemplates)
-void analyze() async {
-  await _run('dart', arguments: ['analyze']);
-}
-
-@Task()
-@Depends(buildStorageArtifacts)
-Future<void> test() => _run(Platform.executable, arguments: ['test']);
-
-@DefaultTask()
-@Depends(analyze, test)
-void analyzeTest() {}
-
 @Task()
 @Depends(buildStorageArtifacts)
 Future<void> serve() async {
@@ -46,34 +32,6 @@ Future<void> serve() async {
   ]);
 }
 
-const _dartImageName = 'dart';
-final _dockerVersionMatcher = RegExp('^FROM $_dartImageName:(.*)\$');
-const _dockerFileNames = [
-  'cloud_run_beta.Dockerfile',
-  'cloud_run_main.Dockerfile',
-  'cloud_run_stable.Dockerfile',
-];
-
-/// Creates an SDK.
-Sdk _getSdk() => Sdk();
-
-@Task('Update the docker and SDK versions')
-void updateDockerVersion() {
-  final platformVersion = Platform.version.split(' ').first;
-  for (final dockerFileName in _dockerFileNames) {
-    final dockerFile = File(dockerFileName);
-    final dockerImageLines = dockerFile.readAsLinesSync().map((String s) {
-      if (s.contains(_dockerVersionMatcher)) {
-        return 'FROM $_dartImageName:$platformVersion';
-      }
-      return s;
-    }).toList();
-    dockerImageLines.add('');
-
-    dockerFile.writeAsStringSync(dockerImageLines.join('\n'));
-  }
-}
-
 final List<String> compilationArtifacts = [
   'dart_sdk.js',
   'flutter_web.js',
@@ -83,7 +41,7 @@ final List<String> compilationArtifacts = [
     'google storage')
 void validateStorageArtifacts() async {
   final args = context.invocation.arguments;
-  final sdk = _getSdk();
+  final sdk = Sdk();
   final version = sdk.dartVersion;
   final bucket = switch (args.hasOption('bucket')) {
     true => args.getOption('bucket'),
@@ -124,7 +82,7 @@ void buildProjectTemplates() async {
     await templatesDirectory.delete(recursive: true);
   }
 
-  final sdk = _getSdk();
+  final sdk = Sdk();
   final projectCreator = ProjectCreator(
     sdk,
     templatesPath,
@@ -142,7 +100,7 @@ void buildProjectTemplates() async {
 @Task('build the sdk compilation artifacts for upload to google storage')
 @Depends(updatePubDependencies)
 void buildStorageArtifacts() async {
-  final sdk = _getSdk();
+  final sdk = Sdk();
   delete(getDir('artifacts'));
   final instructions = <String>[];
 
@@ -227,8 +185,8 @@ Future<String> _buildStorageArtifacts(Directory dir, Sdk sdk,
   }
 
   // Make sure
-  // flutter-sdks/<channel>/bin/cache/flutter_web_sdk/kernel/flutter_ddc_sdk.dill
-  // is installed.
+  // <flutter-sdk>/bin/cache/flutter_web_sdk/kernel/ddc_outline_sound.dill is
+  // installed.
   await _run(
     sdk.flutterToolPath,
     arguments: ['precache', '--web'],
@@ -236,12 +194,12 @@ Future<String> _buildStorageArtifacts(Directory dir, Sdk sdk,
   );
 
   // Build the artifacts using DDC:
-  // dart-sdk/bin/dartdevc -s kernel/flutter_ddc_sdk.dill
+  // dart-sdk/bin/dartdevc -s kernel/ddc_outline_sound.dill
   //     --modules=amd package:flutter/animation.dart ...
   final compilerPath = path.join(sdk.dartSdkPath, 'bin', 'dart');
   final dillPath = path.join(
     sdk.flutterWebSdkPath,
-    'flutter_ddc_sdk_sound.dill',
+    'ddc_outline_sound.dill',
   );
 
   final arguments = <String>[
@@ -288,16 +246,11 @@ Future<String> _buildStorageArtifacts(Directory dir, Sdk sdk,
 }
 
 @Task('Update generated files and run all checks prior to deployment')
-@Depends(updateDockerVersion, generateProtos, analyze, test,
-    validateStorageArtifacts)
+@Depends(buildProjectTemplates, validateStorageArtifacts)
 void deploy() {
   log('Deploy via Google Cloud Console');
 }
 
-@Task()
-@Depends(analyze, buildStorageArtifacts)
-void buildbot() {}
-
 @Task('Generate Protobuf classes')
 void generateProtos() async {
   try {
@@ -347,7 +300,7 @@ Future<void> _run(
 @Task('Update pubspec dependency versions')
 @Depends(buildProjectTemplates)
 void updatePubDependencies() async {
-  final sdk = _getSdk();
+  final sdk = Sdk();
   await _updateDependenciesFile(
       flutterToolPath: sdk.flutterToolPath, channel: sdk.channel, sdk: sdk);
 }
diff --git a/pkgs/sketch_pad/lib/samples.g.dart b/pkgs/sketch_pad/lib/samples.g.dart
index 43b4a9179..27cb03e4a 100644
--- a/pkgs/sketch_pad/lib/samples.g.dart
+++ b/pkgs/sketch_pad/lib/samples.g.dart
@@ -92,7 +92,7 @@ final _fibonacci = Sample(
 // that can be found in the LICENSE file.
 
 void main() {
-  var i = 20;
+  const i = 20;
 
   print('fibonacci($i) = ${fibonacci(i)}');
 }
@@ -114,7 +114,7 @@ final _helloWorld = Sample(
 // that can be found in the LICENSE file.
 
 void main() {
-  for (int i = 0; i < 10; i++) {
+  for (var i = 0; i < 10; i++) {
     print('hello ${i + 1}');
   }
 }
@@ -154,9 +154,9 @@ class MyHomePage extends StatefulWidget {
   final String title;
 
   const MyHomePage({
-    Key? key,
+    super.key,
     required this.title,
-  }) : super(key: key);
+  });
 
   @override
   State<MyHomePage> createState() => _MyHomePageState();