Support latest pkg:html in analyzer, analyzer_plugin

Remove use and DEPS entry for pkg:utf

Related to https://github.com/dart-lang/sdk/issues/35802

Change-Id: I025cbe15fc4dd7a14ca7163bdd84bb610e87ea5d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98874
Reviewed-by: Devon Carew <devoncarew@google.com>
Commit-Queue: Kevin Moore <kevmoo@google.com>
This commit is contained in:
Kevin Moore 2019-04-09 02:06:09 +00:00 committed by commit-bot@chromium.org
parent ca78eed3ea
commit 7959be58a7
5 changed files with 7 additions and 11 deletions

View file

@ -97,7 +97,6 @@ testing:pkg/testing/lib
typed_data:third_party/pkg/typed_data/lib
unittest:third_party/pkg/unittest/lib
usage:third_party/pkg/usage/lib
utf:third_party/pkg/utf/lib
vm:pkg/vm/lib
watcher:third_party/pkg/watcher/lib
web_components:third_party/pkg/web_components/lib

5
DEPS
View file

@ -84,7 +84,7 @@ vars = {
"dartdoc_tag" : "v0.28.2",
"fixnum_tag": "0.10.9",
"glob_tag": "1.1.7",
"html_tag" : "0.13.4+1",
"html_tag" : "0.14.0",
"http_io_rev": "57da05a66f5bf7df3dd7aebe7b7efe0dfc477baa",
"http_multi_server_tag" : "2.0.5",
"http_parser_tag" : "3.1.3",
@ -135,7 +135,6 @@ vars = {
"typed_data_tag": "1.1.6",
"unittest_rev": "2b8375bc98bb9dc81c539c91aaea6adce12e1072",
"usage_tag": "3.4.0",
"utf_tag": "0.9.0+5",
"watcher_rev": "0.9.7+12",
"web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02",
"web_socket_channel_tag": "1.0.9",
@ -362,8 +361,6 @@ deps = {
"@" + Var("unittest_rev"),
Var("dart_root") + "/third_party/pkg/usage":
Var("dart_git") + "usage.git" + "@" + Var("usage_tag"),
Var("dart_root") + "/third_party/pkg/utf":
Var("dart_git") + "utf.git" + "@" + Var("utf_tag"),
Var("dart_root") + "/third_party/pkg/watcher":
Var("dart_git") + "watcher.git" + "@" + Var("watcher_rev"),
Var("dart_root") + "/third_party/pkg/web_components":

View file

@ -1,5 +1,5 @@
name: analyzer
version: 0.36.0
version: 0.36.1-dev
author: Dart Team <misc@dartlang.org>
description: Static analyzer for Dart.
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/analyzer
@ -13,7 +13,7 @@ dependencies:
crypto: '>=1.1.1 <3.0.0'
front_end: 0.1.15
glob: ^1.0.3
html: ^0.13.4+1
html: '>=0.13.4+1 <0.15.0'
kernel: 0.3.15
meta: ^1.0.2
package_config: '>=0.1.5 <2.0.0'

View file

@ -10,7 +10,7 @@ environment:
dependencies:
analyzer: '^0.35.3'
charcode: '^1.1.0'
html: '^0.13.1'
html: '>=0.13.1 <0.15.0'
meta: ^1.0.2
path: '^1.4.1'
pub_semver: '^1.3.2'

View file

@ -22,11 +22,11 @@
// NB: This utility assumes UN*X style line endings, \n, in the LaTeX
// source file received as input; it will not work with other styles.
import 'dart:convert';
import 'dart:io';
import 'package:crypto/crypto.dart';
import 'package:convert/convert.dart';
import 'package:utf/utf.dart';
import 'package:crypto/crypto.dart';
// ----------------------------------------------------------------------
// Normalization of the text: removal or normalization of parts that
@ -491,7 +491,7 @@ computeHashValue(lines, startIndex, nextIndex, listSink) {
final gatheredLine = gatherLines(lines, startIndex, nextIndex);
final simplifiedLine = simplifyLine(gatheredLine);
listSink.write(" % $simplifiedLine\n");
var digest = sha1.convert(encodeUtf8(simplifiedLine));
var digest = sha1.convert(utf8.encode(simplifiedLine));
return digest.bytes;
}