Skip to content

Commit c65f3f2

Browse files
Bump dtd dep to 4.0.0 (#9240)
1 parent 0b5e328 commit c65f3f2

File tree

9 files changed

+23
-20
lines changed

9 files changed

+23
-20
lines changed

packages/devtools_app/lib/src/shared/editor/editor_client.dart

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,24 @@ class EditorClient extends DisposableController
3333

3434
Future<void> _initialize() async {
3535
autoDisposeStreamSubscription(
36-
_dtd.onEvent('Service').listen((data) {
36+
_dtd.onEvent(CoreDtdServiceConstants.servicesStreamId).listen((data) {
3737
final kind = data.kind;
38-
if (kind != 'ServiceRegistered' && kind != 'ServiceUnregistered') {
38+
if (kind != CoreDtdServiceConstants.serviceRegisteredKind &&
39+
kind != CoreDtdServiceConstants.serviceUnregisteredKind) {
3940
return;
4041
}
4142

42-
final service = data.data['service'] as String?;
43+
final service = data.data[DtdParameters.service] as String?;
4344
if (service == null ||
4445
(service != editorServiceName && service != lspServiceName)) {
4546
return;
4647
}
4748

48-
final isRegistered = kind == 'ServiceRegistered';
49-
final method = data.data['method'] as String;
50-
final capabilities = data.data['capabilities'] as Map<String, Object?>?;
49+
final isRegistered =
50+
kind == CoreDtdServiceConstants.serviceRegisteredKind;
51+
final method = data.data[DtdParameters.method] as String;
52+
final capabilities =
53+
data.data[DtdParameters.capabilities] as Map<String, Object?>?;
5154
final lspMethod = LspMethod.fromMethodName(method);
5255
if (lspMethod != null) {
5356
lspMethod.isRegistered = isRegistered;
@@ -126,7 +129,7 @@ class EditorClient extends DisposableController
126129
}),
127130
);
128131
await [
129-
_dtd.streamListen('Service'),
132+
_dtd.streamListen(CoreDtdServiceConstants.servicesStreamId),
130133
_dtd.streamListen(editorStreamName).catchError((_) {
131134
// Because we currently call streamListen in two places (here and
132135
// ThemeManager) this can fail. It doesn't matter if this happens,

packages/devtools_app/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
devtools_app_shared:
2727
devtools_extensions:
2828
devtools_shared:
29-
dtd: ^3.0.0
29+
dtd: ^4.0.0
3030
file: ^7.0.0
3131
file_selector: ^1.0.0
3232
fixnum: ^1.1.0

packages/devtools_app/test/screens/dtd/events_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ void main() {
7171
ConnectedAppServiceConstants.serviceName,
7272
ConnectedAppServiceConstants.vmServiceRegistered,
7373
{
74-
EventParameters.uri: 'ws://127.0.0.1:30000/4G4UPw7fyoQ=/',
75-
EventParameters.exposedUri: 'ws://127.0.0.1:30000/4G4UPw7fyoQ=/',
76-
EventParameters.name: 'Flutter - Android (debug)',
74+
DtdParameters.uri: 'ws://127.0.0.1:30000/4G4UPw7fyoQ=/',
75+
DtdParameters.exposedUri: 'ws://127.0.0.1:30000/4G4UPw7fyoQ=/',
76+
DtdParameters.name: 'Flutter - Android (debug)',
7777
},
7878
0,
7979
),
8080
DTDEvent(
8181
ConnectedAppServiceConstants.serviceName,
8282
ConnectedAppServiceConstants.vmServiceUnregistered,
8383
{
84-
EventParameters.uri: 'ws://127.0.0.1:40000/4G4UPw7fyoQ=/',
85-
EventParameters.exposedUri: 'ws://127.0.0.1:56050/4G4UPw7fyoQ=/',
86-
EventParameters.name: 'Flutter - iOS (debug)',
84+
DtdParameters.uri: 'ws://127.0.0.1:40000/4G4UPw7fyoQ=/',
85+
DtdParameters.exposedUri: 'ws://127.0.0.1:56050/4G4UPw7fyoQ=/',
86+
DtdParameters.name: 'Flutter - iOS (debug)',
8787
},
8888
1,
8989
),

packages/devtools_app_shared/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Use of this source code is governed by a BSD-style license that can be
44
found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
55
-->
66
## 0.4.0
7-
* Bump `dtd` dependency to `^3.0.0`.
7+
* Bump `dtd` dependency to `^4.0.0`.
88
* Bump `devtools_shared` dependency to `^12.0.0`.
99
* Add `DisposableController.init` method and `DisposableController.disposed`
1010
getter.

packages/devtools_app_shared/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
collection: ^1.15.0
1717
dds_service_extensions: ^2.0.0
1818
devtools_shared: ^12.0.0
19-
dtd: ^3.0.0
19+
dtd: ^4.0.0
2020
flutter:
2121
sdk: flutter
2222
logging: ^1.1.1

packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
path: ../../../../../../devtools_app_shared
1717
devtools_extensions:
1818
path: ../../../../../../devtools_extensions
19-
dtd: ^3.0.0
19+
dtd: ^4.0.0
2020
path: ^1.8.0
2121
flutter:
2222
sdk: flutter

packages/devtools_shared/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Use of this source code is governed by a BSD-style license that can be
44
found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
55
-->
66
# 12.0.0
7-
* Update `dtd` dependency to `^3.0.0`.
7+
* Update `dtd` dependency to `^4.0.0`.
88
* Register and unregister VM service connections on DTD. This change only
99
applies to the case where the DevTools server starts DTD (i.e. when a DTD
1010
connection was not passed to the server on startup).

packages/devtools_shared/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resolution: workspace
1616
dependencies:
1717
args: ^2.4.2
1818
collection: ^1.15.0
19-
dtd: ^3.0.0
19+
dtd: ^4.0.0
2020
extension_discovery: ^2.1.0
2121
meta: ^1.9.1
2222
path: ^1.8.0

packages/devtools_test/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
devtools_app:
2121
devtools_app_shared:
2222
devtools_shared:
23-
dtd: ^3.0.0
23+
dtd: ^4.0.0
2424
flutter:
2525
sdk: flutter
2626
flutter_test:

0 commit comments

Comments
 (0)