Skip to content

Commit c566112

Browse files
authored
Drop use of deprecated APIs, bump min SDK and other dependencies (#2449)
1 parent eccc7d8 commit c566112

File tree

17 files changed

+44
-48
lines changed

17 files changed

+44
-48
lines changed

.github/workflows/dart.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- Add implementation for the VM Service's `getFlagList` API. - [#2438](https://github.com/dart-lang/webdev/pull/2438)
77
- Hide more variables from the local scope when debugging. These variables were synthetically added by the compiler to
88
support late local variables and don't appear in the original source code. - [#2445](https://github.com/dart-lang/webdev/pull/2445)
9+
- Require Dart `^3.4`
910

1011
## 24.0.0
1112

dwds/debug_extension/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66
A Chrome extension for Dart debugging.
77
88
environment:
9-
sdk: ^3.2.0-36.0.dev
9+
sdk: ^3.2.0
1010

1111
dependencies:
1212
built_value: ^8.3.0

dwds/lib/src/debugging/inspector.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import 'dart:math' as math;
66

77
import 'package:async/async.dart';
8-
import 'package:collection/collection.dart';
98
import 'package:dwds/src/config/tool_configuration.dart';
109
import 'package:dwds/src/connections/app_connection.dart';
1110
import 'package:dwds/src/debugging/classes.dart';
@@ -113,9 +112,9 @@ class AppInspector implements AppInspectorInterface {
113112
final scripts = await scriptRefs;
114113

115114
await DartUri.initialize();
116-
DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri).whereNotNull());
115+
DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri).nonNulls);
117116
DartUri.recordAbsoluteUris(
118-
scripts.map((script) => script.uri).whereNotNull(),
117+
scripts.map((script) => script.uri).nonNulls,
119118
);
120119

121120
isolate.extensionRPCs?.addAll(await _getExtensionRpcs());

dwds/pubspec.yaml

+19-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66
service protocol.
77
repository: https://github.com/dart-lang/webdev/tree/master/dwds
88
environment:
9-
sdk: ^3.2.0-36.0.dev
9+
sdk: ^3.4.0
1010

1111
dependencies:
1212
async: ^2.9.0
@@ -15,46 +15,46 @@ dependencies:
1515
collection: ^1.15.0
1616
crypto: ^3.0.2
1717
dds: ^4.1.0
18-
file: ">=6.0.0 <8.0.0"
19-
http: ^0.13.4
18+
file: ">=6.1.4 <8.0.0"
19+
http: ^1.0.0
2020
http_multi_server: ^3.2.0
2121
logging: ^1.0.2
22-
meta: ^1.7.0
22+
meta: ^1.9.1
2323
package_config: ^2.0.2
2424
path: ^1.8.1
2525
pool: ^1.5.0
2626
pub_semver: ^2.1.1
2727
shelf: ^1.3.0
28-
shelf_packages_handler: "^3.0.0"
29-
shelf_proxy: ^1.0.1
28+
shelf_packages_handler: ^3.0.0
29+
shelf_proxy: ^1.0.4
3030
shelf_static: ^1.1.0
31-
shelf_web_socket: ^1.0.1
31+
shelf_web_socket: '>=1.0.0 <3.0.0'
3232
source_maps: ^0.10.10
3333
stack_trace: ^1.10.0
3434
sse: ^4.1.2
35-
uuid: ^3.0.6
36-
vm_service: ^14.0.0
35+
uuid: ^4.0.0
36+
vm_service: ^14.2.4
3737
vm_service_interface: 1.1.0
38-
web_socket_channel: ^2.2.0
38+
web_socket_channel: ^2.4.0
3939
webkit_inspection_protocol: ^1.0.1
4040

4141
dev_dependencies:
42-
args: ^2.3.1
43-
build: ^2.3.0
42+
args: ^2.4.2
43+
build: ^2.3.1
4444
build_daemon: ^4.0.0
45-
build_runner: ^2.4.0
45+
build_runner: ^2.4.1
4646
build_version: ^2.1.1
47-
build_web_compilers: ^4.0.4
48-
built_value_generator: ^8.3.0
47+
build_web_compilers: ^4.0.8
48+
built_value_generator: ^8.4.2
4949
graphs: ^2.1.0
5050
frontend_server_common:
5151
path: ../frontend_server_common
52-
js: ^0.6.4
52+
js: ">=0.6.4 <0.8.0"
5353
lints: ^4.0.0
5454
pubspec_parse: ^1.2.0
55-
puppeteer: ^3.0.0
56-
stream_channel: ^2.1.0
57-
test: ^1.21.1
55+
puppeteer: ^3.1.1
56+
stream_channel: ^2.1.2
57+
test: ^1.21.6
5858
test_common:
5959
path: ../test_common
6060
webdriver: ^3.0.0

example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A web app example for webdev CLI.
44
publish_to: none
55

66
environment:
7-
sdk: ^3.2.0-36.0.dev
7+
sdk: ^3.2.0
88

99
dev_dependencies:
1010
build_runner: ^2.4.0

fixtures/_experimentSound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
intl: ^0.17.0

fixtures/_testCircular1Sound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
intl: ^0.17.0

fixtures/_testCircular2Sound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
_test_circular1_sound:

fixtures/_testHotRestart1Sound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
intl: ^0.17.0

fixtures/_testHotRestart2Sound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
intl: ^0.17.0

fixtures/_testPackageSound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
_test_sound:

fixtures/_testSound/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
publish_to: none
66

77
environment:
8-
sdk: ^3.2.0-36.0.dev
8+
sdk: ^3.2.0
99

1010
dependencies:
1111
intl: ^0.17.0

fixtures/_webdevSoundSmoke/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A test fixture for webdev testing with sound support.
44
publish_to: none
55

66
environment:
7-
sdk: ^3.2.0-36.0.dev
7+
sdk: ^3.2.0
88

99
dev_dependencies:
1010
build_runner: ^2.4.0

frontend_server_common/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publish_to: none
33
description: >-
44
Frontend server integration code to use for dwds tests. Mimics flutter code.
55
environment:
6-
sdk: ^3.2.0-36.0.dev
6+
sdk: ^3.2.0
77

88
dependencies:
99
dwds: any

tool/ci.sh

+7-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webdev/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: >-
88
features for users and tools to build and deploy web applications with Dart.
99
repository: https://github.com/dart-lang/webdev/tree/master/webdev
1010
environment:
11-
sdk: ^3.2.0-36.0.dev
11+
sdk: ^3.2.0
1212

1313
dependencies:
1414
args: ^2.3.1
@@ -20,7 +20,7 @@ dependencies:
2020
dds: ^4.1.0
2121
# Pin DWDS to avoid dependency conflicts with vm_service:
2222
dwds: 24.0.0
23-
http: ^0.13.4
23+
http: ^1.0.0
2424
http_multi_server: ^3.2.0
2525
io: ^1.0.3
2626
logging: ^1.0.2

0 commit comments

Comments
 (0)