Skip to content

Commit b2532e0

Browse files
authored
Prepare for release (#1273)
Towards flutter/flutter#77856 Prepare to release `package:dwds` and `package:webdev`. Roll a bunch of deps to ensure `mockito ^5.0.0` can be used with `package:dwds`. Closes #1232
1 parent 51ad9e7 commit b2532e0

20 files changed

Lines changed: 176 additions & 269 deletions

File tree

‎.github/workflows/dart.yml‎

Lines changed: 122 additions & 143 deletions
Large diffs are not rendered by default.

‎dwds/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 9.0.0-dev
1+
## 9.0.0
22

33
- Fix an issue where relative worker paths provided to the `ExpressionCompilerService`
44
would cause a crash.

‎dwds/lib/src/version.dart‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dwds/pubspec.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
name: dwds
22
# Every time this changes you need to run `pub run build_runner build`.
3-
version: 9.0.0-dev
3+
version: 9.0.0
44
homepage: https://github.com/dart-lang/webdev/tree/master/dwds
55
description: >-
66
A service that proxies between the Chrome debug protocol and the Dart VM
77
service protocol.
88
99
environment:
10-
sdk: ">=2.10.0 <3.0.0"
10+
sdk: ">=2.12.0 <3.0.0"
1111

1212
dependencies:
1313
async: ^2.3.0
1414
built_collection: ^4.2.0
15-
built_value: '>=6.7.0 <8.0.0'
15+
built_value: '>=6.7.0 <9.0.0'
1616
crypto: '>=2.0.6 < 4.0.0'
1717
dds: ^1.4.1
1818
# devtools_server indirectly depends on devtools so keep this around.
19-
devtools: ^0.9.2
20-
devtools_server: ^0.9.2
19+
devtools: ^2.0.0
20+
devtools_server: ^2.0.0
2121
http: ^0.12.0
2222
http_multi_server: ^2.0.0
2323
logging: ^0.11.3
2424
meta: ^1.1.7
25-
package_config: ^1.9.0
25+
package_config: ^2.0.0
2626
path: ^1.6.0
2727
pedantic: ^1.5.0
2828
pool: ^1.4.0
29-
pub_semver: ^1.4.2
29+
pub_semver: ^2.0.0
3030
shelf: ^0.7.0
3131
shelf_packages_handler: '>=1.0.0 <3.0.0'
3232
shelf_proxy: ^0.1.0+6

‎dwds/test/debug_extension_test.dart‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// When run locally this test may require a manifest key. This makes it easy to
88
// just skip it.
99
@Tags(['extension'])
10+
@Timeout(Duration(seconds: 60))
1011
@OnPlatform({
1112
'windows': Skip('https://github.com/dart-lang/webdev/issues/711'),
1213
})
@@ -51,13 +52,19 @@ void main() async {
5152
});
5253

5354
test('can close DevTools and relaunch', () async {
54-
await (await context.webDriver.windows.toList()).last.close();
55+
for (var window in await context.webDriver.windows.toList()) {
56+
await context.webDriver.driver.switchTo.window(window);
57+
if (await context.webDriver.title == 'Dart DevTools') {
58+
await window.close();
59+
break;
60+
}
61+
}
5562

5663
// Relaunch DevTools by (fake) clicking the extension.
5764
await context.extensionConnection.sendCommand('Runtime.evaluate', {
5865
'expression': 'fakeClick()',
5966
});
60-
await Future.delayed(const Duration(seconds: 2));
67+
await Future.delayed(const Duration(seconds: 4));
6168
var windows = await context.webDriver.windows.toList();
6269
await context.webDriver.driver.switchTo.window(windows.last);
6370
expect(await context.webDriver.title, 'Dart DevTools');

‎example/mono_pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
dart: dev
88
- group:
99
- dartanalyzer: --fatal-warnings .
10-
dart: [2.10.0]
10+
dart: [2.12.0]
1111

1212
cache:
1313
directories:

‎fixtures/_webdevSmoke/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: A test fixture for webdev testing.
77
# and build_web_compilers constraint should match those defined
88
# in pubspec.dart.
99
environment:
10-
sdk: '>=2.11.99 <3.0.0'
10+
sdk: '>=2.12.0 <3.0.0'
1111

1212
dev_dependencies:
1313
build_runner: '>=1.6.2 <2.0.0'

‎fixtures/_webdevSmoke/web/main.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// @dart = 2.9
6+
57
import 'dart:async';
68
import 'dart:convert';
79
import 'dart:developer';

‎fixtures/_webdevSmoke/web/scopes_main.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// @dart = 2.9
6+
57
/// An example with more complicated scope
68
import 'dart:async';
79
import 'dart:collection';

‎frontend_server_client/mono_pkg.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ stages:
44
- group:
55
- dartfmt
66
- dartanalyzer: --fatal-infos --fatal-warnings .
7-
dart: 2.12.0
7+
dart: [2.12.0]

0 commit comments

Comments
 (0)