From 96cf91bea3d19a284d1c9ebaf2180719aa00610d Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 19 Mar 2021 19:49:08 +0000 Subject: [PATCH] [ package:dds ] Update DDS dependencies and set SDK requirement to >=2.12 Also updated non-migrated libraries to include @dart=2.10. Change-Id: Idcf4e54f9aa37b9b016133144af594cc932418a0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/192122 Reviewed-by: Gary Roumanis --- .dart_tool/package_config.json | 8 ++++---- DEPS | 12 ++++++------ pkg/dds/CHANGELOG.md | 3 +++ pkg/dds/bin/dds.dart | 2 ++ pkg/dds/example/example.dart | 2 ++ pkg/dds/lib/dds.dart | 2 ++ pkg/dds/lib/src/binary_compatible_peer.dart | 2 ++ pkg/dds/lib/src/client.dart | 2 ++ pkg/dds/lib/src/client_manager.dart | 2 ++ pkg/dds/lib/src/constants.dart | 2 ++ pkg/dds/lib/src/dds_impl.dart | 2 ++ pkg/dds/lib/src/expression_evaluator.dart | 2 ++ pkg/dds/lib/src/isolate_manager.dart | 2 ++ pkg/dds/lib/src/logging_repository.dart | 2 ++ pkg/dds/lib/src/named_lookup.dart | 2 ++ pkg/dds/lib/src/rpc_error_codes.dart | 2 ++ pkg/dds/lib/src/stream_manager.dart | 2 ++ pkg/dds/lib/vm_service_extensions.dart | 2 ++ pkg/dds/pubspec.yaml | 16 ++++++++-------- pkg/dds/test/auth_codes_test.dart | 2 ++ pkg/dds/test/common/fakes.dart | 2 ++ pkg/dds/test/common/test_helper.dart | 2 ++ .../external_compilation_service_script.dart | 2 ++ .../test/external_compilation_service_test.dart | 2 ++ pkg/dds/test/get_stream_history_script.dart | 2 ++ pkg/dds/test/get_stream_history_test.dart | 2 ++ ...ndles_client_disconnect_state_error_test.dart | 2 ++ ...les_connection_closed_before_full_header.dart | 2 ++ pkg/dds/test/on_event_with_history_script.dart | 2 ++ pkg/dds/test/on_event_with_history_test.dart | 2 ++ pkg/dds/test/smoke.dart | 2 ++ pkg/dds/test/smoke_test.dart | 2 ++ pkg/dds/test/sse_smoke_test.dart | 2 ++ pkg/dds/test/uri_test.dart | 2 ++ pkg/dds/test/web/sse_smoke_driver.dart | 2 ++ 35 files changed, 83 insertions(+), 18 deletions(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index beda8cfa9f8..1b1635edca6 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -11,7 +11,7 @@ "constraint, update this by running tools/generate_package_config.dart." ], "configVersion": 2, - "generated": "2021-03-18T10:46:33.455990", + "generated": "2021-03-19T12:24:33.467679", "generator": "tools/generate_package_config.dart", "packages": [ { @@ -244,7 +244,7 @@ "name": "dds", "rootUri": "../pkg/dds", "packageUri": "lib/", - "languageVersion": "2.6" + "languageVersion": "2.12" }, { "name": "dev_compiler", @@ -581,7 +581,7 @@ "name": "shelf_proxy", "rootUri": "../third_party/pkg/shelf_proxy", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.12" }, { "name": "shelf_static", @@ -791,7 +791,7 @@ "name": "webdriver", "rootUri": "../third_party/pkg/webdriver", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.12" }, { "name": "webkit_inspection_protocol", diff --git a/DEPS b/DEPS index fd28f64f57a..225447d1839 100644 --- a/DEPS +++ b/DEPS @@ -141,11 +141,11 @@ vars = { "resource_rev": "6b79867d0becf5395e5819a75720963b8298e9a7", "root_certificates_rev": "7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8", "rust_revision": "b7856f695d65a8ebc846754f97d15814bcb1c244", - "shelf_static_rev": "bafde9eaddb5d02040a614e41deddd971b4d67e6", + "shelf_static_rev": "fa30419055279a00c9e428439b1abe362d18f25d", "shelf_packages_handler_rev": "78302e67c035047e6348e692b0c1182131f0fe35", - "shelf_proxy_tag": "0.1.0+7", - "shelf_rev": "e9294125f0c1fc2049c958577cd586ca2395168f", - "shelf_web_socket_rev": "aa312d3cdeef96fb64bc3e602bc354a05a995624", + "shelf_proxy_tag": "v1.0.0", + "shelf_rev": "00e50adfb776602c25942a99d89f8704cc20db9c", + "shelf_web_socket_rev": "24fb8a04befa75a94ac63a27047b231d1a22aab4", "source_map_stack_trace_rev": "1c3026f69d9771acf2f8c176a1ab750463309cce", "source_maps-0.9.4_rev": "38524", "source_maps_rev": "53eb92ccfe6e64924054f83038a534b959b12b3e", @@ -165,9 +165,9 @@ vars = { "usage_rev": "6c64d9e7b6b3758d06d030efcb5afe20bfc04dde", "vector_math_rev": "0c9f5d68c047813a6dcdeb88ba7a42daddf25025", "watcher_rev": "3924194385fb215cef483193ed2879a618a3d69c", - "webdriver_rev": "5a8d6805d9cf8a3cbb4fcd64849b538b7491e50e", + "webdriver_rev": "ff5ccb1522edf4bed578ead4d65e0cbc1f2c4f02", "web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02", - "web_socket_channel_rev": "76931ea1b81ba71e8319330c35285d3e88566315", + "web_socket_channel_rev": "d3e100de8feb0283a04732366bb591ebd2282d7d", "WebCore_rev": "fb11e887f77919450e497344da570d780e078bc8", "webkit_inspection_protocol_rev": "6b15729292d030f2e5c5861022da4c5a4c11961c", "yaml_rev": "b4c4411631bda556ce9a45af1ab0eecaf9f3ac53", diff --git a/pkg/dds/CHANGELOG.md b/pkg/dds/CHANGELOG.md index 62904a1022b..e374a78718c 100644 --- a/pkg/dds/CHANGELOG.md +++ b/pkg/dds/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.7.6 +- Update dependencies. + # 1.7.5 - Add 30 second keep alive period for SSE connections. diff --git a/pkg/dds/bin/dds.dart b/pkg/dds/bin/dds.dart index 3ac9a09a46f..9937d26ad0b 100644 --- a/pkg/dds/bin/dds.dart +++ b/pkg/dds/bin/dds.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:io'; import 'package:dds/dds.dart'; diff --git a/pkg/dds/example/example.dart b/pkg/dds/example/example.dart index 883c678e7db..561dca92f41 100644 --- a/pkg/dds/example/example.dart +++ b/pkg/dds/example/example.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'package:dds/dds.dart'; import 'package:vm_service/vm_service_io.dart'; diff --git a/pkg/dds/lib/dds.dart b/pkg/dds/lib/dds.dart index a9024dd7862..f7c7a05594e 100644 --- a/pkg/dds/lib/dds.dart +++ b/pkg/dds/lib/dds.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + /// A library used to spawn the Dart Developer Service, used to communicate /// with a Dart VM Service instance. library dds; diff --git a/pkg/dds/lib/src/binary_compatible_peer.dart b/pkg/dds/lib/src/binary_compatible_peer.dart index b701f5e4cf3..2e1af84c216 100644 --- a/pkg/dds/lib/src/binary_compatible_peer.dart +++ b/pkg/dds/lib/src/binary_compatible_peer.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'dart:convert'; import 'dart:typed_data'; diff --git a/pkg/dds/lib/src/client.dart b/pkg/dds/lib/src/client.dart index 0c854c320ef..f81bd25b400 100644 --- a/pkg/dds/lib/src/client.dart +++ b/pkg/dds/lib/src/client.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; diff --git a/pkg/dds/lib/src/client_manager.dart b/pkg/dds/lib/src/client_manager.dart index b16897840c9..c911c51278e 100644 --- a/pkg/dds/lib/src/client_manager.dart +++ b/pkg/dds/lib/src/client_manager.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; import 'client.dart'; diff --git a/pkg/dds/lib/src/constants.dart b/pkg/dds/lib/src/constants.dart index c6450d5cde8..2466390d62a 100644 --- a/pkg/dds/lib/src/constants.dart +++ b/pkg/dds/lib/src/constants.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + abstract class RPCResponses { static const success = { 'type': 'Success', diff --git a/pkg/dds/lib/src/dds_impl.dart b/pkg/dds/lib/src/dds_impl.dart index 6daaeddef27..db355fbad4e 100644 --- a/pkg/dds/lib/src/dds_impl.dart +++ b/pkg/dds/lib/src/dds_impl.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'dart:convert'; import 'dart:io'; diff --git a/pkg/dds/lib/src/expression_evaluator.dart b/pkg/dds/lib/src/expression_evaluator.dart index bb69bb52cf4..59bbe369315 100644 --- a/pkg/dds/lib/src/expression_evaluator.dart +++ b/pkg/dds/lib/src/expression_evaluator.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; import 'client.dart'; diff --git a/pkg/dds/lib/src/isolate_manager.dart b/pkg/dds/lib/src/isolate_manager.dart index 2714021d8ff..a5139d5da2d 100644 --- a/pkg/dds/lib/src/isolate_manager.dart +++ b/pkg/dds/lib/src/isolate_manager.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; import 'client.dart'; diff --git a/pkg/dds/lib/src/logging_repository.dart b/pkg/dds/lib/src/logging_repository.dart index f87fdaa3c61..0b31ca6053c 100644 --- a/pkg/dds/lib/src/logging_repository.dart +++ b/pkg/dds/lib/src/logging_repository.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:math'; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; diff --git a/pkg/dds/lib/src/named_lookup.dart b/pkg/dds/lib/src/named_lookup.dart index 603bbc0caab..8515411be94 100644 --- a/pkg/dds/lib/src/named_lookup.dart +++ b/pkg/dds/lib/src/named_lookup.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + // Originally pulled from dart:_vmservice. import 'dart:collection'; diff --git a/pkg/dds/lib/src/rpc_error_codes.dart b/pkg/dds/lib/src/rpc_error_codes.dart index 93c514ead9c..895c07ca273 100644 --- a/pkg/dds/lib/src/rpc_error_codes.dart +++ b/pkg/dds/lib/src/rpc_error_codes.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; abstract class RpcErrorCodes { diff --git a/pkg/dds/lib/src/stream_manager.dart b/pkg/dds/lib/src/stream_manager.dart index 28c7f28f4bd..26bc6d7733d 100644 --- a/pkg/dds/lib/src/stream_manager.dart +++ b/pkg/dds/lib/src/stream_manager.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:typed_data'; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; diff --git a/pkg/dds/lib/vm_service_extensions.dart b/pkg/dds/lib/vm_service_extensions.dart index 8373b87a00a..0b6aaf435f0 100644 --- a/pkg/dds/lib/vm_service_extensions.dart +++ b/pkg/dds/lib/vm_service_extensions.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'dart:collection'; diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml index 469fc0e070c..221e3df8821 100644 --- a/pkg/dds/pubspec.yaml +++ b/pkg/dds/pubspec.yaml @@ -3,27 +3,27 @@ description: >- A library used to spawn the Dart Developer Service, used to communicate with a Dart VM Service instance. -version: 1.7.5 +version: 1.7.6 homepage: https://github.com/dart-lang/sdk/tree/master/pkg/dds environment: - sdk: '>=2.6.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: async: ^2.4.1 json_rpc_2: ^2.2.0 meta: ^1.1.8 pedantic: ^1.7.0 - shelf: ^0.7.5 - shelf_proxy: ^0.1.0+7 - shelf_web_socket: ^0.2.3 + shelf: ^1.0.0 + shelf_proxy: ^1.0.0 + shelf_web_socket: ^1.0.0 sse: ^3.7.0 stream_channel: ^2.0.0 vm_service: ^6.0.1-nullsafety.0 - web_socket_channel: ^1.1.0 + web_socket_channel: ^2.0.0 dev_dependencies: - shelf_static: ^0.2.8 + shelf_static: ^1.0.0 test: ^1.0.0 - webdriver: ^2.1.2 + webdriver: ^3.0.0 diff --git a/pkg/dds/test/auth_codes_test.dart b/pkg/dds/test/auth_codes_test.dart index 653ff41c361..fa8cd44ed9a 100644 --- a/pkg/dds/test/auth_codes_test.dart +++ b/pkg/dds/test/auth_codes_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:convert'; import 'dart:io'; diff --git a/pkg/dds/test/common/fakes.dart b/pkg/dds/test/common/fakes.dart index 7e11f9d14b7..663cdd08f32 100644 --- a/pkg/dds/test/common/fakes.dart +++ b/pkg/dds/test/common/fakes.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; diff --git a/pkg/dds/test/common/test_helper.dart b/pkg/dds/test/common/test_helper.dart index cda9ce23567..7cdb204f8b5 100644 --- a/pkg/dds/test/common/test_helper.dart +++ b/pkg/dds/test/common/test_helper.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:convert'; import 'dart:io'; diff --git a/pkg/dds/test/external_compilation_service_script.dart b/pkg/dds/test/external_compilation_service_script.dart index b01ed609a7a..00c92085e51 100644 --- a/pkg/dds/test/external_compilation_service_script.dart +++ b/pkg/dds/test/external_compilation_service_script.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:developer'; main() { diff --git a/pkg/dds/test/external_compilation_service_test.dart b/pkg/dds/test/external_compilation_service_test.dart index 92e5ac86bbd..f31b9c080e2 100644 --- a/pkg/dds/test/external_compilation_service_test.dart +++ b/pkg/dds/test/external_compilation_service_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:io'; import 'package:dds/dds.dart'; diff --git a/pkg/dds/test/get_stream_history_script.dart b/pkg/dds/test/get_stream_history_script.dart index 68dafec250d..1f8b82084e0 100644 --- a/pkg/dds/test/get_stream_history_script.dart +++ b/pkg/dds/test/get_stream_history_script.dart @@ -1,3 +1,5 @@ +// @dart = 2.10 + import 'dart:developer'; void main() { diff --git a/pkg/dds/test/get_stream_history_test.dart b/pkg/dds/test/get_stream_history_test.dart index c2ae8f98eab..6631d24d45f 100644 --- a/pkg/dds/test/get_stream_history_test.dart +++ b/pkg/dds/test/get_stream_history_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:io'; import 'package:dds/dds.dart'; diff --git a/pkg/dds/test/handles_client_disconnect_state_error_test.dart b/pkg/dds/test/handles_client_disconnect_state_error_test.dart index 87d027ccec6..974814a903b 100644 --- a/pkg/dds/test/handles_client_disconnect_state_error_test.dart +++ b/pkg/dds/test/handles_client_disconnect_state_error_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'package:dds/dds.dart'; diff --git a/pkg/dds/test/handles_connection_closed_before_full_header.dart b/pkg/dds/test/handles_connection_closed_before_full_header.dart index 80f1744d7a5..7be10431005 100644 --- a/pkg/dds/test/handles_connection_closed_before_full_header.dart +++ b/pkg/dds/test/handles_connection_closed_before_full_header.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'dart:io'; diff --git a/pkg/dds/test/on_event_with_history_script.dart b/pkg/dds/test/on_event_with_history_script.dart index 3f27df0c347..e35decce677 100644 --- a/pkg/dds/test/on_event_with_history_script.dart +++ b/pkg/dds/test/on_event_with_history_script.dart @@ -1,3 +1,5 @@ +// @dart=2.10 + import 'dart:developer'; void main() { diff --git a/pkg/dds/test/on_event_with_history_test.dart b/pkg/dds/test/on_event_with_history_test.dart index 55e04b9a208..42f25a15e5d 100644 --- a/pkg/dds/test/on_event_with_history_test.dart +++ b/pkg/dds/test/on_event_with_history_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'dart:io'; diff --git a/pkg/dds/test/smoke.dart b/pkg/dds/test/smoke.dart index f4c4774e41e..f1f92a2ad5b 100644 --- a/pkg/dds/test/smoke.dart +++ b/pkg/dds/test/smoke.dart @@ -1,3 +1,5 @@ +// @dart=2.10 + void main() { print('Hello world!'); } diff --git a/pkg/dds/test/smoke_test.dart b/pkg/dds/test/smoke_test.dart index 983a2daf133..2f59ef0a3cc 100644 --- a/pkg/dds/test/smoke_test.dart +++ b/pkg/dds/test/smoke_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:convert'; import 'dart:io'; diff --git a/pkg/dds/test/sse_smoke_test.dart b/pkg/dds/test/sse_smoke_test.dart index 9d4a9a6eff1..2b5e696550d 100644 --- a/pkg/dds/test/sse_smoke_test.dart +++ b/pkg/dds/test/sse_smoke_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:async'; import 'dart:convert'; import 'dart:io'; diff --git a/pkg/dds/test/uri_test.dart b/pkg/dds/test/uri_test.dart index 8c7e64eb20d..dad20f3c1c9 100644 --- a/pkg/dds/test/uri_test.dart +++ b/pkg/dds/test/uri_test.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + import 'dart:io'; import 'package:dds/dds.dart'; diff --git a/pkg/dds/test/web/sse_smoke_driver.dart b/pkg/dds/test/web/sse_smoke_driver.dart index 4f0ab258045..f8769f5c84b 100644 --- a/pkg/dds/test/web/sse_smoke_driver.dart +++ b/pkg/dds/test/web/sse_smoke_driver.dart @@ -2,6 +2,8 @@ // 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. +// @dart=2.10 + // This file must be compiled for changes to be picked up. // // Run the following command from the root of this package if this file is