Add package_resolver to dartium DEPS, update both DEPS files.
BUG=https://github.com/dart-lang/sdk/issues/21949
BUG=https://github.com/dart-lang/sdk/issues/27065
R=eernst@google.com
Review URL: https://codereview.chromium.org/2354863002 .
diff --git a/DEPS b/DEPS
index 9c6161a..16d478c 100644
--- a/DEPS
+++ b/DEPS
@@ -151,7 +151,7 @@
Var("boringssl_rev"),
Var("dart_root") + "/third_party/root_certificates":
- "https://github.com/dart-lang/root_certificates.git" +
+ (Var("github_mirror") % "root_certificates") +
Var("root_certificates_rev"),
Var("dart_root") + "/third_party/jinja2":
@@ -191,7 +191,7 @@
Var("dart_root") + "/third_party/pkg/collection":
(Var("github_mirror") % "collection") + Var("collection_tag"),
Var("dart_root") + "/third_party/pkg/convert":
- "https://github.com/dart-lang/convert.git" + Var("convert_tag"),
+ (Var("github_mirror") % "convert") + Var("convert_tag"),
Var("dart_root") + "/third_party/pkg/crypto":
(Var("github_mirror") % "crypto") + Var("crypto_tag"),
Var("dart_root") + "/third_party/pkg/csslib":
@@ -290,7 +290,7 @@
Var("dart_root") + "/third_party/pkg/shelf":
(Var("github_mirror") % "shelf") + Var("shelf_tag"),
Var("dart_root") + "/third_party/pkg/shelf_packages_handler":
- "https://github.com/dart-lang/shelf_packages_handler.git"
+ (Var("github_mirror") % "shelf_packages_handler")
+ Var("shelf_packages_handler_tag"),
Var("dart_root") + "/third_party/pkg/shelf_static":
(Var("github_mirror") % "shelf_static") + Var("shelf_static_tag"),
diff --git a/tools/deps/dartium.deps/DEPS b/tools/deps/dartium.deps/DEPS
index 6a7b70f..99c82f4 100644
--- a/tools/deps/dartium.deps/DEPS
+++ b/tools/deps/dartium.deps/DEPS
@@ -29,7 +29,7 @@
"args_tag": "@0.13.0",
"barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51",
"charcode_tag": "@1.1.0",
- "collection_rev": "@f6135e6350c63eb3f4dd12953b8d4363faff16fc",
+ "collection_tag": "@1.9.1",
"crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d",
"csslib_tag" : "@0.12.0",
"dart2js_info_rev" : "@0a221eaf16aec3879c45719de656680ccb80d8a1",
@@ -48,6 +48,7 @@
"oauth2_rev": "@1bff41f4d54505c36f2d1a001b83b8b745c452f5",
"observatory_pub_packages_rev": "@26aad88f1c1915d39bbcbff3cad589e2402fdcf1",
"package_config_rev": "@0.1.3",
+ "package_resolver_tag": "@1.0.2",
"path_rev": "@b657c0854d1cf41c014986fa9d2321f1173df805",
"plugin_tag": "@0.1.0",
"pool_rev": "@22e12aeb16ad0b626900dbe79e4a25391ddfb28c",
@@ -94,7 +95,7 @@
"src/dart/third_party/pkg/dart2js_info":
(Var("github_mirror") % "dart2js_info") + Var("dart2js_info_rev"),
"src/dart/third_party/pkg/collection":
- (Var("github_mirror") % "collection") + Var("collection_rev"),
+ (Var("github_mirror") % "collection") + Var("collection_tag"),
"src/dart/third_party/pkg/glob":
(Var("github_mirror") % "glob") + Var("glob_rev"),
"src/dart/third_party/pkg/html":
@@ -125,8 +126,11 @@
"src/dart/third_party/observatory_pub_packages":
(Var("github_mirror") % "observatory_pub_packages") +
Var("observatory_pub_packages_rev"),
- "src/dart/third_party/pkg/package_config":
+ "src/dart/third_party/pkg_tested/package_config":
(Var("github_mirror") % "package_config") + Var("package_config_rev"),
+ "src/dart/third_party/pkg_tested/package_resolver":
+ "https://github.com/dart-lang/package_resolver.git" +
+ Var("package_resolver_tag"),
"src/dart/third_party/pkg/path":
(Var("github_mirror") % "path") + Var("path_rev"),
"src/dart/third_party/pkg/plugin":
@@ -230,3 +234,19 @@
"src/dart/tools/sdks",
],
})
+hooks.append({
+ "name": "unittest",
+ # Unittest is an early version, 0.11.6, of the package "test"
+ # Do not use it in any new tests.
+ "pattern": ".",
+ "action": [
+ "download_from_google_storage",
+ "--no_auth",
+ "--no_resume",
+ "--bucket",
+ "dart-dependencies",
+ "--extract",
+ "-s",
+ "src/dart/third_party/pkg/unittest.tar.gz.sha1",
+ ],
+})
