Skip to content

Update analyzer to 0.31.2-alpha.2. #1682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/src/model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/file_system/file_system.dart' as fileSystem;
import 'package:analyzer/file_system/physical_file_system.dart';
import 'package:analyzer/source/package_map_resolver.dart';
import 'package:analyzer/source/sdk_ext.dart';
import 'package:analyzer/src/source/package_map_resolver.dart';
import 'package:analyzer/src/source/sdk_ext.dart';
// TODO(jcollins-g): Stop using internal analyzer structures somehow.
import 'package:analyzer/src/context/builder.dart';
import 'package:analyzer/src/dart/analysis/file_state.dart';
Expand Down
15 changes: 4 additions & 11 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "0.31.2-alpha.1"
version: "0.31.2-alpha.2"
args:
dependency: "direct main"
description:
Expand Down Expand Up @@ -91,7 +91,7 @@ packages:
name: front_end
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.0-alpha.11"
version: "0.1.0-alpha.12"
glob:
dependency: transitive
description:
Expand Down Expand Up @@ -141,13 +141,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.2+1"
isolate:
dependency: transitive
description:
name: isolate
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
js:
dependency: transitive
description:
Expand All @@ -161,7 +154,7 @@ packages:
name: kernel
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0-alpha.11"
version: "0.3.0-alpha.12"
logging:
dependency: "direct main"
description:
Expand Down Expand Up @@ -408,4 +401,4 @@ packages:
source: hosted
version: "2.1.13"
sdks:
dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.49.0"
dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.51.0"
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ homepage: https://github.com/dart-lang/dartdoc
environment:
sdk: '>=2.0.0-dev.9.0 <3.0.0'
dependencies:
analyzer: '0.31.2-alpha.1'
analyzer: '0.31.2-alpha.2'
args: '>=0.13.0 <2.0.0'
collection: ^1.2.0
front_end: ^0.1.0-alpha.11
front_end: ^0.1.0-alpha.12
html: '>=0.12.1 <0.14.0'
# We don't use http_parser directly; this dep exists to ensure that we get at
# least version 3.0.3 to work around an issue with 3.0.2.
Expand Down
1 change: 0 additions & 1 deletion test/dartdoc_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'dart:io';
import 'package:dartdoc/dartdoc.dart';
import 'package:dartdoc/src/model.dart';
import 'package:dartdoc/src/package_meta.dart';
import 'package:io/io.dart';
import 'package:path/path.dart' as pathLib;
import 'package:test/test.dart';

Expand Down
7 changes: 5 additions & 2 deletions tool/grind.dart
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,11 @@ testPreviewDart2() async {
List<String> parameters = ['--preview-dart-2', '--enable-asserts'];

// sdk#32901 is really bad on Windows.
for (File dartFile in testFiles.where((f) =>
!f.path.endsWith('html_generator_test.dart') && !Platform.isWindows)) {
for (File dartFile in testFiles
.where((f) =>
!f.path.endsWith('html_generator_test.dart') && !Platform.isWindows)
.where((f) =>
!f.path.endsWith('grind_test.dart'))) {
// absolute path to work around dart-lang/sdk#32901
await testFutures.addFuture(new SubprocessLauncher(
'dart2-${pathLib.basename(dartFile.absolute.path)}')
Expand Down