Skip to content

Commit f71f9dd

Browse files
author
Dart CI
committed
Version 2.11.0-264.0.dev
Merge commit '6cee3b5fe121039aa4f6bd9b9a9a50c74a2c06bd' into 'dev'
2 parents 7463a3e + 6cee3b5 commit f71f9dd

File tree

123 files changed

+4370
-2551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+4370
-2551
lines changed

.dart_tool/package_config.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"constraint, update this by running tools/generate_package_config.dart."
1212
],
1313
"configVersion": 2,
14-
"generated": "2020-10-20T23:33:25.579167",
14+
"generated": "2020-10-26T09:42:07.748397",
1515
"generator": "tools/generate_package_config.dart",
1616
"packages": [
1717
{
@@ -150,6 +150,12 @@
150150
"packageUri": "lib/",
151151
"languageVersion": "2.0"
152152
},
153+
{
154+
"name": "clock",
155+
"rootUri": "../third_party/pkg/clock",
156+
"packageUri": "lib/",
157+
"languageVersion": "2.10"
158+
},
153159
{
154160
"name": "collection",
155161
"rootUri": "../third_party/pkg/collection",
@@ -332,7 +338,7 @@
332338
"name": "intl",
333339
"rootUri": "../third_party/pkg/intl",
334340
"packageUri": "lib/",
335-
"languageVersion": "2.5"
341+
"languageVersion": "2.11"
336342
},
337343
{
338344
"name": "js",
@@ -509,12 +515,6 @@
509515
"packageUri": "lib/",
510516
"languageVersion": "2.0"
511517
},
512-
{
513-
"name": "quiver",
514-
"rootUri": "../third_party/pkg/quiver",
515-
"packageUri": "lib/",
516-
"languageVersion": "2.0"
517-
},
518518
{
519519
"name": "resource",
520520
"rootUri": "../third_party/pkg/resource",

.packages

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ pool:third_party/pkg/pool/lib
7979
protobuf:third_party/pkg/protobuf/protobuf/lib
8080
pub:third_party/pkg/pub/lib
8181
pub_semver:third_party/pkg/pub_semver/lib
82-
quiver:third_party/pkg/quiver/lib
8382
resource:third_party/pkg/resource/lib
8483
sdk_library_metadata:sdk/lib/_internal/sdk_library_metadata/lib
8584
shelf:third_party/pkg/shelf/lib

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44

55
#### `dart:io`
66

7-
* `HttpRequest` will now correctly follow HTTP 308 redirects
8-
(`HttpStatus.permanentRedirect`).
7+
* `HttpRequest` will now correctly follow HTTP 308 redirects
8+
(`HttpStatus.permanentRedirect`).
9+
10+
#### `dart:isolate`
11+
12+
* Added `debugName` positional parameter to `ReceivePort` and `RawReceivePort`
13+
constructors, a name which can be associated with the port and displayed in
14+
tooling.
915

1016
### Dart VM
1117

DEPS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ vars = {
7676
"charcode_rev": "bcd8a12c315b7a83390e4865ad847ecd9344cba2",
7777
"chrome_rev" : "19997",
7878
"cli_util_rev" : "335ed165887d0ec97c2a09173ebf22dcf56a6c4e",
79+
"clock_rev" : "a494269254ba978e7ef8f192c5f7fec3fc05b9d3",
7980
"collection_rev": "60e6ee2228586980826b07ec1df633bd879f42ea",
8081
"convert_rev": "c1b01f832835d3d8a06b0b246a361c0eaab35d3c",
8182
"crypto_rev": "f7c48b334b1386bc5ab0f706fbcd6df8496a87fc",
@@ -110,7 +111,7 @@ vars = {
110111
"http_throttle_tag" : "1.0.2",
111112
"icu_rev" : "79326efe26e5440f530963704c3c0ff965b3a4ac",
112113
"idl_parser_rev": "5fb1ebf49d235b5a70c9f49047e83b0654031eb7",
113-
"intl_tag": "0.16.1",
114+
"intl_tag": "0.17.0-nullsafety",
114115
"jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",
115116
"json_rpc_2_rev": "8f189db8f0c299187a0e8fa959dba7e9b0254be5",
116117
"linter_tag": "0.1.121",
@@ -312,6 +313,8 @@ deps = {
312313
Var("dart_git") + "charcode.git" + "@" + Var("charcode_rev"),
313314
Var("dart_root") + "/third_party/pkg/cli_util":
314315
Var("dart_git") + "cli_util.git" + "@" + Var("cli_util_rev"),
316+
Var("dart_root") + "/third_party/pkg/clock":
317+
Var("dart_git") + "clock.git" + "@" + Var("clock_rev"),
315318
Var("dart_root") + "/third_party/pkg/collection":
316319
Var("dart_git") + "collection.git" + "@" + Var("collection_rev"),
317320
Var("dart_root") + "/third_party/pkg/convert":

pkg/analyzer/lib/src/pubspec/pubspec_validator.dart

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'package:analyzer/error/error.dart';
66
import 'package:analyzer/error/listener.dart';
77
import 'package:analyzer/file_system/file_system.dart';
8+
import 'package:analyzer/src/generated/engine.dart';
89
import 'package:analyzer/src/generated/source.dart';
910
import 'package:analyzer/src/pubspec/pubspec_warning_code.dart';
1011
import 'package:path/path.dart' as path;
@@ -204,6 +205,12 @@ class PubspecValidator {
204205
}
205206

206207
/// Validate that `path` entries reference valid paths.
208+
///
209+
/// Valid paths are directories that:
210+
///
211+
/// 1. exist,
212+
/// 2. contain a pubspec.yaml file, and
213+
/// 3. `lib` dir
207214
void _validatePathEntries(ErrorReporter reporter, YamlNode dependency) {
208215
if (dependency is YamlMap) {
209216
for (var node in dependency.nodes.entries) {
@@ -214,9 +221,18 @@ class PubspecValidator {
214221
var packageRoot = context.dirname(source.fullName);
215222
var dependencyPath =
216223
path.canonicalize(context.join(packageRoot, normalizedPath));
217-
if (!provider.getFolder(dependencyPath).exists) {
224+
var packageFolder = provider.getFolder(dependencyPath);
225+
if (!packageFolder.exists) {
218226
_reportErrorForNode(reporter, node.value,
219227
PubspecWarningCode.PATH_DOES_NOT_EXIST, [pathEntry]);
228+
} else {
229+
if (!packageFolder
230+
.getChild(AnalysisEngine.PUBSPEC_YAML_FILE)
231+
.exists) {
232+
_reportErrorForNode(reporter, node.value,
233+
PubspecWarningCode.PATH_PUBSPEC_DOES_NOT_EXIST, [pathEntry]);
234+
}
235+
// todo (pq): test for presence of a lib dir.
220236
}
221237
}
222238
}

pkg/analyzer/lib/src/pubspec/pubspec_warning_code.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,17 @@ class PubspecWarningCode extends ErrorCode {
7272
correction:
7373
"Try creating the referenced path or using a path that exists.");
7474

75+
/// A code indicating that a specified path dependency points to a directory
76+
/// that does not contain a pubspec.
77+
///
78+
/// Parameters:
79+
/// 0: the path to the dependency as given in the file.
80+
static const PubspecWarningCode PATH_PUBSPEC_DOES_NOT_EXIST = PubspecWarningCode(
81+
'PATH_PUBSPEC_DOES_NOT_EXIST',
82+
"The directory {0} does not contain a pubspec.",
83+
correction:
84+
"Try creating a pubspec in the referenced directory or using a path that has a pubspec.");
85+
7586
/// A code indicating that a package listed as a dev dependency is also listed
7687
/// as a normal dependency.
7788
///

pkg/analyzer/test/src/pubspec/pubspec_validator_test.dart

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class PubspecValidatorTest with ResourceProviderMixin {
4949
validator = PubspecValidator(resourceProvider, source);
5050
}
5151

52-
test_assetDirectoryDoesExists_noError() {
52+
test_assetDirectoryDoesExist_noError() {
5353
newFolder('/sample/assets/logos');
5454
assertNoErrors('''
5555
name: sample
@@ -208,17 +208,21 @@ dependencies:
208208
''');
209209
}
210210

211-
test_dependencyPathDoesNotExist_path_error() {
211+
test_dependencyPath_pubspecDoesNotExist() {
212+
newFolder('/foo');
212213
assertErrors('''
213214
name: sample
214215
dependencies:
215216
foo:
216-
path: does/not/exist
217-
''', [PubspecWarningCode.PATH_DOES_NOT_EXIST]);
217+
path: /foo
218+
''', [PubspecWarningCode.PATH_PUBSPEC_DOES_NOT_EXIST]);
218219
}
219220

220-
test_dependencyPathExists() {
221+
test_dependencyPath_pubspecExists() {
221222
newFolder('/foo');
223+
newFile('/foo/pubspec.yaml', content: '''
224+
name: foo
225+
''');
222226
assertNoErrors('''
223227
name: sample
224228
dependencies:
@@ -227,8 +231,24 @@ dependencies:
227231
''');
228232
}
229233

230-
test_dependencyPathRelativeExists() {
234+
test_dependencyPath_valid_absolute() {
231235
newFolder('/foo');
236+
newFile('/foo/pubspec.yaml', content: '''
237+
name: foo
238+
''');
239+
assertNoErrors('''
240+
name: sample
241+
dependencies:
242+
foo:
243+
path: /foo
244+
''');
245+
}
246+
247+
test_dependencyPath_valid_relative() {
248+
newFolder('/foo');
249+
newFile('/foo/pubspec.yaml', content: '''
250+
name: foo
251+
''');
232252
assertNoErrors('''
233253
name: sample
234254
dependencies:
@@ -237,6 +257,15 @@ dependencies:
237257
''');
238258
}
239259

260+
test_dependencyPathDoesNotExist_path_error() {
261+
assertErrors('''
262+
name: sample
263+
dependencies:
264+
foo:
265+
path: does/not/exist
266+
''', [PubspecWarningCode.PATH_DOES_NOT_EXIST]);
267+
}
268+
240269
test_devDependenciesField_empty() {
241270
assertNoErrors('''
242271
name: sample
@@ -270,6 +299,9 @@ dev_dependencies:
270299

271300
test_devDependencyPathExists() {
272301
newFolder('/foo');
302+
newFile('/foo/pubspec.yaml', content: '''
303+
name: foo
304+
''');
273305
assertNoErrors('''
274306
name: sample
275307
dev_dependencies:

pkg/analyzer_cli/pubspec.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ publish_to: none
66

77
environment:
88
sdk: "^2.7.0"
9+
910
dependencies:
10-
analyzer: ^0.37.0
11+
analyzer: any
1112
args: '>=0.13.0 <2.0.0'
1213
bazel_worker: ^0.1.0
1314
collection: ^1.14.1
@@ -17,8 +18,13 @@ dependencies:
1718
path: any
1819
pub_semver: ^1.4.2
1920
yaml: ^2.1.2
21+
2022
dev_dependencies:
2123
pedantic: ^1.9.0
2224
protobuf: ^0.13.0
2325
test_reflective_loader: ^0.1.8
2426
test: ^1.0.0
27+
28+
dependency_overrides:
29+
analyzer:
30+
path: ../analyzer

pkg/async_helper/pubspec.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
name: async_helper
22
# This package is not intended for consumption on pub.dev. DO NOT publish.
33
publish_to: none
4+
45
description: >-
56
Async_helper is used for asynchronous tests that do not want to
67
make use of the Dart unittest library - for example, the core
78
language tests.
89
Third parties are discouraged from using this, and should use
910
the facilities provided in package:test.
11+
12+
environment:
13+
sdk: '>=2.0.0'
14+
1015
dependencies:
11-
expect: any
16+
expect:
17+
path: ../expect

pkg/build_integration/pubspec.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ environment:
99
sdk: '>=2.1.0 <3.0.0'
1010

1111
dependencies:
12-
front_end: ^0.1.0
12+
front_end: any
1313

1414
dev_dependencies:
1515
test: any
16+
17+
dependency_overrides:
18+
front_end:
19+
path: ../front_end

0 commit comments

Comments
 (0)