Skip to content

Commit 6306a2a

Browse files
author
Anna Gringauze
authored
Annagrin/prep to release webdev (#1412)
* Prep to release webdev * build * Fix integration test break * Made integration test for for all sdk versions * Trigger rebuild to unstuck the CI
1 parent 256dce9 commit 6306a2a

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
lines changed

dwds/test/readers/frontend_server_asset_reader_test.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import 'package:dwds/dwds.dart';
1111
import 'package:path/path.dart' as p;
1212
import 'package:test/test.dart';
1313

14-
final _batExt = Platform.isWindows ? '.bat' : '';
14+
import '../fixtures/utilities.dart';
15+
1516
final packagesDir = p.relative('../fixtures/_test', from: p.current);
1617

1718
void main() {
@@ -31,7 +32,7 @@ void main() {
3132
}
3233

3334
setUpAll(() async {
34-
await Process.run('pub$_batExt', ['upgrade'],
35+
await Process.run(dartPath, ['pub', 'upgrade'],
3536
workingDirectory: packagesDir);
3637
});
3738

webdev/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 2.7.6-dev
1+
## 2.7.6
22

33
- Update SDK constraint to `>=2.14.0 <3.0.0`
44

webdev/lib/src/pubspec.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ class PackageExceptionDetails {
3434
{this.description, bool missingDependency})
3535
: _missingDependency = missingDependency ?? false;
3636

37-
static const noPubspecLock = PackageExceptionDetails._(
38-
'`pubspec.lock` does not exist.',
39-
description:
40-
'Run `$appName` in a Dart package directory. Run `pub get` first.',
41-
missingDependency: true);
37+
static const noPubspecLock =
38+
PackageExceptionDetails._('`pubspec.lock` does not exist.',
39+
description: 'Run `$appName` in a Dart package directory. '
40+
'Run `dart pub get` first.',
41+
missingDependency: true);
4242

4343
static PackageExceptionDetails missingDep(
4444
String pkgName, VersionConstraint constraint) =>

webdev/lib/src/version.dart

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

webdev/pubspec.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: webdev
22
# Every time this changes you need to run `pub run build_runner build`.
3-
version: 2.7.6-dev
3+
version: 2.7.6
44
# We should not depend on a dev SDK before publishing.
55
# publish_to: none
66
homepage: https://github.com/dart-lang/webdev
@@ -18,7 +18,7 @@ dependencies:
1818
browser_launcher: ^1.0.0
1919
crypto: ^3.0.0
2020
dds: ^2.0.0
21-
dwds: ^11.2.3
21+
dwds: ^11.3.0
2222
http: ^0.13.0
2323
http_multi_server: ^3.0.0
2424
io: ^1.0.0
@@ -50,9 +50,5 @@ dev_dependencies:
5050
test_process: ^2.0.2
5151
webdriver: ^3.0.0
5252

53-
dependency_overrides:
54-
dwds:
55-
path: ../dwds
56-
5753
executables:
5854
webdev:

webdev/test/integration_test.dart

+10-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@
55
// @dart = 2.9
66

77
import 'dart:async';
8+
import 'dart:io';
89

10+
import 'package:pub_semver/pub_semver.dart';
911
import 'package:test/test.dart';
1012
import 'package:test_descriptor/test_descriptor.dart' as d;
1113

1214
import 'test_utils.dart';
1315

1416
void main() {
17+
var sdkVersion = Version.parse(Platform.version.split(' ')[0]);
18+
var firstSdkVersionWithoutPub = Version(2, 15, 0, pre: '0');
19+
20+
var pubCommand =
21+
sdkVersion.compareTo(firstSdkVersionWithoutPub) < 0 ? 'pub' : 'dart pub';
22+
1523
test('non-existant commands create errors', () async {
1624
var process = await runWebDev(['monkey']);
1725

@@ -224,7 +232,7 @@ name: sample
224232

225233
await checkProcessStdout(process, [
226234
'webdev could not run for this project.',
227-
'No pubspec.lock file found, please run "pub get" first.'
235+
'No pubspec.lock file found, please run "$pubCommand get" first.'
228236
]);
229237
await process.shouldExit(78);
230238
});
@@ -251,7 +259,7 @@ dependencies:
251259
// See https://github.com/dart-lang/linter/issues/965
252260
// ignore: prefer_adjacent_string_concatenation
253261
'The pubspec.yaml file has changed since the pubspec.lock file ' +
254-
'was generated, please run "pub get" again.'
262+
'was generated, please run "$pubCommand get" again.'
255263
]);
256264
await process.shouldExit(78);
257265
});

0 commit comments

Comments
 (0)