Skip to content

Commit fca6949

Browse files
devoncarewCommit Queue
authored andcommitted
[deps] remove the dep on the google/file.dart repo
Change-Id: I2fdca859906a4c6d7713cde1131ead77b4230750 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389405 Reviewed-by: Nate Bosch <[email protected]> Commit-Queue: Devon Carew <[email protected]>
1 parent 7eb48a9 commit fca6949

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

DEPS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ vars = {
146146
"dart_style_rev": "5d35f4d829ffb8532d345d95d3e9504ae6cd839e", # disable tools/rev_sdk_deps.dart
147147
"dartdoc_rev": "80c6f18f34b387d4b9ce89ddd2e3049093335f9d",
148148
"ecosystem_rev": "2d58550f9e3fd8ecbc3b2e4444095fcb204a66c6",
149-
"file_rev": "6842feaef1c4e06239bd30f8d3ef722838b1c97e",
150149
"fixnum_rev": "83293b8ed86ccd574a94fcf4a2da43f31c1b43e0",
151150
"flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
152151
"glob_rev": "00a9c82d31c01ae88ec9ae4021d842e9b832aa52",
@@ -422,9 +421,6 @@ deps = {
422421
"url": Var("dart_git") + "flute.git" + "@" + Var("flute_rev"),
423422
"condition": "checkout_flute",
424423
},
425-
Var("dart_root") + "/third_party/pkg/file":
426-
Var("dart_git") + "external/github.com/google/file.dart"
427-
+ "@" + Var("file_rev"),
428424
Var("dart_root") + "/third_party/pkg/glob":
429425
Var("dart_git") + "glob.git" + "@" + Var("glob_rev"),
430426
Var("dart_root") + "/third_party/pkg/html":

tools/generate_package_config.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import 'dart:convert';
99
import 'dart:io';
1010

1111
// Important! Do not add package: imports to this file.
12+
//
1213
// Do not add relative deps for libraries that themselves use package deps.
14+
//
1315
// This tool runs before the .dart_tool/package_config.json file is created, so
1416
// can not itself use package references.
1517

@@ -88,14 +90,6 @@ void main(List<String> args) {
8890
];
8991
packages.sort((a, b) => a.name.compareTo(b.name));
9092

91-
// TODO(devoncarew): Temporarily ignore the second package:file and
92-
// package:file_testing locations.
93-
packages.removeWhere((p) {
94-
final path = posix(p.rootUri);
95-
return path == 'third_party/pkg/file/packages/file' ||
96-
path == 'third_party/pkg/file/packages/file_testing';
97-
});
98-
9993
// Remove any packages with identical names.
10094
final uniqueNames = packages.map((p) => p.name).toSet();
10195

tools/package_deps/bin/package_deps.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,6 @@ class SdkDeps {
453453
_findPackages(Directory('pkg'));
454454
_findPackages(Directory(path.join('third_party', 'devtools')));
455455
_findPackages(Directory(path.join('third_party', 'pkg')));
456-
_findPackages(
457-
Directory(path.join('third_party', 'pkg', 'file', 'packages')));
458456

459457
if (verbose) {
460458
print('Package versions in the SDK:');

0 commit comments

Comments
 (0)