Skip to content

Commit e3fcee3

Browse files
bkonyicommit-bot@chromium.org
authored andcommitted
[ VM / Service ] Roll back major revision, update to 3.39
The major revision bump is causing Intellij users to be unable to debug as the Dart and Flutter plugins both bail out if the VM service major revision is not 3. This change will allow for these plugins to keep working. This is technically breaking the semver contract as the following RPCs and objects have been removed: - getClientName - getWebSocketTarget - setClientName - requireResumeApproval - ClientName - WebSocketTarget However, these RPCs were never used by first party tooling and it's highly unlikely that they were used externally, so removing these RPCs is unlikely to break anyone. Change-Id: Ie8e2705545682e96c3dab4c0787a1e88cd8a19d5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162240 Reviewed-by: Devon Carew <[email protected]> Commit-Queue: Ben Konyi <[email protected]>
1 parent f6906f8 commit e3fcee3

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

pkg/vm_service/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## 5.0.0
44

5-
- **breaking**: Update to version `4.0.0` of the spec.
5+
- **breaking**: Update to version `3.39.0` of the spec.
66
- Removes `ClientName` and `WebSocketTarget` objects
77
- Removes `getClientName`, `getWebSocketTarget`, `requirePermissionToResume`,
88
and `setClientName` RPCs.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=4.0
1+
version=3.39

pkg/vm_service/lib/src/vm_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export 'snapshot_graph.dart'
2828
HeapSnapshotObjectNoData,
2929
HeapSnapshotObjectNullData;
3030

31-
const String vmServiceVersion = '4.0.0';
31+
const String vmServiceVersion = '3.39.0';
3232

3333
/// @optional
3434
const String optional = 'optional';

pkg/vm_service/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: vm_service
22
description: >-
33
A library to communicate with a service implementing the Dart VM
44
service protocol.
5-
version: 5.0.0
5+
version: 5.0.0+1
66

77
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/vm_service
88

runtime/observatory/tests/service/get_version_rpc_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ var tests = <VMTest>[
1111
(VM vm) async {
1212
var result = await vm.invokeRpcNoUpgrade('getVersion', {});
1313
expect(result['type'], equals('Version'));
14-
expect(result['major'], equals(4));
15-
expect(result['minor'], equals(0));
14+
expect(result['major'], equals(3));
15+
expect(result['minor'], equals(39));
1616
expect(result['_privateMajor'], equals(0));
1717
expect(result['_privateMinor'], equals(0));
1818
},

runtime/vm/service.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
namespace dart {
1616

17-
#define SERVICE_PROTOCOL_MAJOR_VERSION 4
18-
#define SERVICE_PROTOCOL_MINOR_VERSION 0
17+
#define SERVICE_PROTOCOL_MAJOR_VERSION 3
18+
#define SERVICE_PROTOCOL_MINOR_VERSION 39
1919

2020
class Array;
2121
class EmbedderServiceHandler;

runtime/vm/service/service.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Dart VM Service Protocol 4.0
1+
# Dart VM Service Protocol 3.39
22

33
> Please post feedback to the [observatory-discuss group][discuss-list]
44
5-
This document describes of _version 4.0_ of the Dart VM Service Protocol. This
5+
This document describes of _version 3.39_ of the Dart VM Service Protocol. This
66
protocol is used to communicate with a running Dart Virtual Machine.
77

88
To use the Service Protocol, start the VM with the *--observe* flag.
@@ -3834,6 +3834,6 @@ version | comments
38343834
3.36 | Added `getProcessMemoryUsage` RPC and `ProcessMemoryUsage` and `ProcessMemoryItem` objects.
38353835
3.37 | Added `getWebSocketTarget` RPC and `WebSocketTarget` object.
38363836
3.38 | Added `isSystemIsolate` property to `@Isolate` and `Isolate`, `isSystemIsolateGroup` property to `@IsolateGroup` and `IsolateGroup`, and properties `systemIsolates` and `systemIsolateGroups` to `VM`.
3837-
4.0 | Removed the following deprecated RPCs and objects: `getClientName`, `getWebSocketTarget`, `setClientName`, `requireResumeApproval`, `ClientName`, and `WebSocketTarget`.
3837+
3.39 | Removed the following deprecated RPCs and objects: `getClientName`, `getWebSocketTarget`, `setClientName`, `requireResumeApproval`, `ClientName`, and `WebSocketTarget`.
38383838

38393839
[discuss-list]: https://groups.google.com/a/dartlang.org/forum/#!forum/observatory-discuss

0 commit comments

Comments
 (0)