From 638a669bfbc38253c57ae8cd89bed5924a1cbef8 Mon Sep 17 00:00:00 2001
From: Derek Xu <derekx@google.com>
Date: Mon, 11 Dec 2023 10:15:00 -0500
Subject: [PATCH] Defer changes in v3.3.0-wip to v4.0.0-wip

---
 frontend_server_client/CHANGELOG.md              |  8 +++-----
 .../lib/src/frontend_server_client.dart          | 16 ++++++++--------
 frontend_server_client/pubspec.yaml              |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/frontend_server_client/CHANGELOG.md b/frontend_server_client/CHANGELOG.md
index eccbcfca5..047c86e8a 100644
--- a/frontend_server_client/CHANGELOG.md
+++ b/frontend_server_client/CHANGELOG.md
@@ -1,14 +1,12 @@
 ## 4.0.0-wip
 
+- Update Dart SDK constraint to `^3.0.0`.
+- Support changes in the SDK layout for Dart 3.0.
 - By default, start the frontend server from the AOT snapshot shipped in the
   Dart SDK.
 - Throw an `ArgumentError` when `FrontendServerClient.start` is called with the
   `frontendServerPath` argument omitted and the `debug` argument set to true.
-
-## 3.3.0
-
-- Update Dart SDK constraint to `>=3.0.0 <4.0.0`.
-- Support changes in the SDK layout for Dart 3.0.
+- Update `package:vm_service` constraint to `^14.0.0`.
 
 ## 3.2.0
 
diff --git a/frontend_server_client/lib/src/frontend_server_client.dart b/frontend_server_client/lib/src/frontend_server_client.dart
index 13fedb898..3a62274a4 100644
--- a/frontend_server_client/lib/src/frontend_server_client.dart
+++ b/frontend_server_client/lib/src/frontend_server_client.dart
@@ -103,10 +103,10 @@ class FrontendServerClient {
       feServer = await Process.start(
         Platform.resolvedExecutable,
         <String>[
-              if (debug) '--observe',
-              frontendServerPath,
-              ...commonArguments,
-            ],
+          if (debug) '--observe',
+          frontendServerPath,
+          ...commonArguments,
+        ],
       );
     } else if (File(_feServerAotSnapshotPath).existsSync()) {
       if (debug) {
@@ -123,10 +123,10 @@ class FrontendServerClient {
       feServer = await Process.start(
         Platform.resolvedExecutable,
         <String>[
-              if (debug) '--observe',
-              _feServerAppJitSnapshotPath,
-              ...commonArguments,
-            ],
+          if (debug) '--observe',
+          _feServerAppJitSnapshotPath,
+          ...commonArguments,
+        ],
       );
     }
     var feServerStdoutLines = StreamQueue(feServer.stdout
diff --git a/frontend_server_client/pubspec.yaml b/frontend_server_client/pubspec.yaml
index 4b70bd14e..7f0657b70 100644
--- a/frontend_server_client/pubspec.yaml
+++ b/frontend_server_client/pubspec.yaml
@@ -20,4 +20,4 @@ dev_dependencies:
   test: ^1.16.0
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
-  vm_service: ^8.0.0
+  vm_service: ^14.0.0