DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll to Dart SDK 1.20.0-dev.5.0. (#5911)

Browse Source 
* Roll to Dart SDK `1.20.0-dev.5.0`.

* bumps to `1.20.0-dev.5.0`.
* updates `analyzer` API use.

* Add explicit types.
This commit is contained in:
Phil Quitslund 2016-09-16 16:30:34 -07:00 committed by GitHub
parent 51cd8b6799
commit 2d4d171338
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cache/dart-sdk.version vendored
View File

@ -1 +1 @@
1.20.0-dev.1.0
1.20.0-dev.5.0

4
packages/flutter_test/lib/src/controller.dart
View File

@ -74,7 +74,7 @@ class WidgetController {
/// * Use [firstWidget] if you expect to match several but only want the first.
Iterable<Widget/*=T*/> widgetList/*<T extends Widget>*/(Finder finder) {
TestAsyncUtils.guardSync();
return finder.evaluate().map((Element element) => element.widget);
return finder.evaluate().map/*<T>*/((Element element) => element.widget);
}
@ -219,7 +219,7 @@ class WidgetController {
/// * Use [firstRenderObject] if you expect to match several but only want the first.
Iterable<RenderObject/*=T*/> renderObjectList/*<T extends RenderObject>*/(Finder finder) {
TestAsyncUtils.guardSync();
return finder.evaluate().map((Element element) => element.renderObject);
return finder.evaluate().map/*<T>*/((Element element) => element.renderObject);
}

2
packages/flutter_tools/lib/executable.dart
View File

@ -85,7 +85,7 @@ Future<Null> main(List<String> args) async {
..addCommand(new UpdatePackagesCommand(hidden: !verboseHelp))
..addCommand(new UpgradeCommand());
return Chain.capture(() async {
return Chain.capture/*<Future<Null>>*/(() async {
// Initialize globals.
context[Logger] = new StdoutLogger();
context[DeviceManager] = new DeviceManager();

15
packages/flutter_tools/lib/src/dart/analysis.dart
View File

@ -10,6 +10,7 @@ import 'package:analyzer/file_system/physical_file_system.dart';
import 'package:analyzer/plugin/options.dart';
import 'package:analyzer/source/analysis_options_provider.dart';
import 'package:analyzer/source/error_processor.dart';
import 'package:analyzer/source/package_map_resolver.dart';
import 'package:analyzer/src/context/builder.dart'; // ignore: implementation_imports
import 'package:analyzer/src/dart/sdk/sdk.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/engine.dart'; // ignore: implementation_imports
@ -32,6 +33,8 @@ class AnalysisDriver {
AnalysisOptionsProvider analysisOptionsProvider =
new AnalysisOptionsProvider();
file_system.ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
AnalysisContext context;
DriverOptions options;
@ -110,7 +113,7 @@ class AnalysisDriver {
resolvers.add(new DartUriResolver(sdk));
} else {
// Fall back to a standard SDK if no embedder is found.
FolderBasedDartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE,
FolderBasedDartSdk sdk = new FolderBasedDartSdk(resourceProvider,
PhysicalResourceProvider.INSTANCE.getFolder(sdkDir));
sdk.analysisOptions = context.analysisOptions;
@ -118,11 +121,15 @@ class AnalysisDriver {
}
if (options.packageRootPath != null) {
JavaFile packageDirectory = new JavaFile(options.packageRootPath);
resolvers.add(new PackageUriResolver(<JavaFile>[packageDirectory]));
ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
builder.defaultPackagesDirectoryPath = options.packageRootPath;
PackageMapUriResolver packageUriResolver = new PackageMapUriResolver(resourceProvider,
builder.convertPackagesToMap(builder.createPackageMap('')));
resolvers.add(packageUriResolver);
}
resolvers.add(new file_system.ResourceUriResolver(PhysicalResourceProvider.INSTANCE));
resolvers.add(new file_system.ResourceUriResolver(resourceProvider));
return resolvers;
}