Skip to content

Drop use of deprecated APIs, bump min SDK and other dependencies #2449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dart.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

## 24.0.0

Expand Down
2 changes: 1 addition & 1 deletion dwds/debug_extension/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >-
A Chrome extension for Dart debugging.

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
built_value: ^8.3.0
Expand Down
5 changes: 2 additions & 3 deletions dwds/lib/src/debugging/inspector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import 'dart:math' as math;

import 'package:async/async.dart';
import 'package:collection/collection.dart';
import 'package:dwds/src/config/tool_configuration.dart';
import 'package:dwds/src/connections/app_connection.dart';
import 'package:dwds/src/debugging/classes.dart';
Expand Down Expand Up @@ -113,9 +112,9 @@ class AppInspector implements AppInspectorInterface {
final scripts = await scriptRefs;

await DartUri.initialize();
DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri).whereNotNull());
DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri).nonNulls);
DartUri.recordAbsoluteUris(
scripts.map((script) => script.uri).whereNotNull(),
scripts.map((script) => script.uri).nonNulls,
);

isolate.extensionRPCs?.addAll(await _getExtensionRpcs());
Expand Down
38 changes: 19 additions & 19 deletions dwds/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >-
service protocol.
repository: https://github.com/dart-lang/webdev/tree/master/dwds
environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.4.0

dependencies:
async: ^2.9.0
Expand All @@ -15,46 +15,46 @@ dependencies:
collection: ^1.15.0
crypto: ^3.0.2
dds: ^4.1.0
file: ">=6.0.0 <8.0.0"
http: ^0.13.4
file: ">=6.1.4 <8.0.0"
http: ^1.0.0
http_multi_server: ^3.2.0
logging: ^1.0.2
meta: ^1.7.0
meta: ^1.9.1
package_config: ^2.0.2
path: ^1.8.1
pool: ^1.5.0
pub_semver: ^2.1.1
shelf: ^1.3.0
shelf_packages_handler: "^3.0.0"
shelf_proxy: ^1.0.1
shelf_packages_handler: ^3.0.0
shelf_proxy: ^1.0.4
shelf_static: ^1.1.0
shelf_web_socket: ^1.0.1
shelf_web_socket: '>=1.0.0 <3.0.0'
source_maps: ^0.10.10
stack_trace: ^1.10.0
sse: ^4.1.2
uuid: ^3.0.6
vm_service: ^14.0.0
uuid: ^4.0.0
vm_service: ^14.2.4
vm_service_interface: 1.1.0
web_socket_channel: ^2.2.0
web_socket_channel: ^2.4.0
webkit_inspection_protocol: ^1.0.1

dev_dependencies:
args: ^2.3.1
build: ^2.3.0
args: ^2.4.2
build: ^2.3.1
build_daemon: ^4.0.0
build_runner: ^2.4.0
build_runner: ^2.4.1
build_version: ^2.1.1
build_web_compilers: ^4.0.4
built_value_generator: ^8.3.0
build_web_compilers: ^4.0.8
built_value_generator: ^8.4.2
graphs: ^2.1.0
frontend_server_common:
path: ../frontend_server_common
js: ^0.6.4
js: ">=0.6.4 <0.8.0"
lints: ^4.0.0
pubspec_parse: ^1.2.0
puppeteer: ^3.0.0
stream_channel: ^2.1.0
test: ^1.21.1
puppeteer: ^3.1.1
stream_channel: ^2.1.2
test: ^1.21.6
test_common:
path: ../test_common
webdriver: ^3.0.0
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A web app example for webdev CLI.
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dev_dependencies:
build_runner: ^2.4.0
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_experimentSound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
intl: ^0.17.0
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testCircular1Sound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
intl: ^0.17.0
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testCircular2Sound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
_test_circular1_sound:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testHotRestart1Sound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
intl: ^0.17.0
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testHotRestart2Sound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
intl: ^0.17.0
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testPackageSound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
_test_sound:
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_testSound/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: >-
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
intl: ^0.17.0
Expand Down
2 changes: 1 addition & 1 deletion fixtures/_webdevSoundSmoke/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A test fixture for webdev testing with sound support.
publish_to: none

environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dev_dependencies:
build_runner: ^2.4.0
Expand Down
2 changes: 1 addition & 1 deletion frontend_server_common/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish_to: none
description: >-
Frontend server integration code to use for dwds tests. Mimics flutter code.
environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
dwds: any
Expand Down
18 changes: 7 additions & 11 deletions tool/ci.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webdev/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: >-
features for users and tools to build and deploy web applications with Dart.
repository: https://github.com/dart-lang/webdev/tree/master/webdev
environment:
sdk: ^3.2.0-36.0.dev
sdk: ^3.2.0

dependencies:
args: ^2.3.1
Expand All @@ -20,7 +20,7 @@ dependencies:
dds: ^4.1.0
# Pin DWDS to avoid dependency conflicts with vm_service:
dwds: 24.0.0
http: ^0.13.4
http: ^1.0.0
http_multi_server: ^3.2.0
io: ^1.0.3
logging: ^1.0.2
Expand Down
Loading