From 94f45c8876b2c4626462e7327f800fd33c842070 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 26 Apr 2018 00:01:35 +0000 Subject: [PATCH] Bring in the latest pub Bug: 32593 Change-Id: I4a8ce82591249968cfb00e9c57ddf75afb760d14 Reviewed-on: https://dart-review.googlesource.com/52700 Commit-Queue: Nate Bosch Reviewed-by: Kevin Moore --- CHANGELOG.md | 3 +++ DEPS | 2 +- sdk/BUILD.gn | 17 ----------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa6a988c5bb..c9a00c4f351 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ #### Pub +* The `build` and `serve` commands will now fail and point users to + https://webdev.dartlang.org/dart-2 + #### Other Tools ## 2.0.0-dev.49.0 diff --git a/DEPS b/DEPS index 163bf8db6bd..1fad6361573 100644 --- a/DEPS +++ b/DEPS @@ -114,7 +114,7 @@ vars = { "ply_rev": "@604b32590ffad5cbb82e4afef1d305512d06ae93", "pool_tag": "@1.3.4", "protobuf_tag": "@0.7.1", - "pub_rev": "@4947e0b3cb3ec77e4e8fe0d3141ce4dc60f43256", + "pub_rev": "@2e821bff00c00889afe5200e3a33f280ce942336", "pub_semver_tag": "@1.3.7", "quiver_tag": "@5aaa3f58c48608af5b027444d561270b53f15dbf", "resource_rev":"@af5a5bf65511943398146cf146e466e5f0b95cb9", diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 4d58c0436c0..766a11403cd 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -270,21 +270,6 @@ copy_tree_specs += [ { ignore_patterns = "{}" } ] -# This rule copies pub assets to lib/_internal/pub/asset -copy_tree_specs += [ { - target = "copy_pub_assets" - visibility = [ - ":create_common_sdk", - ":copy_7zip", - ] - deps = [ - ":copy_libraries", - ] - source = "../third_party/pkg/pub/lib/src/asset" - dest = "$root_out_dir/dart-sdk/lib/_internal/pub/asset" - ignore_patterns = "{}" - } ] - # This loop generates rules to copy libraries to lib/ foreach(library, _full_sdk_libraries) { copy_tree_specs += [ { @@ -305,7 +290,6 @@ if (is_win) { visibility = [ ":create_common_sdk" ] deps = [ ":copy_libraries", - ":copy_pub_assets", ] source = "../third_party/7zip" dest = "$root_out_dir/dart-sdk/lib/_internal/pub/asset/7zip" @@ -959,7 +943,6 @@ group("create_common_sdk") { ":copy_license", ":copy_libraries_specification", ":copy_platform_files", - ":copy_pub_assets", ":copy_readme", ":copy_vm_dill_files", ":write_revision_file",