From 0fe82c3a6fd9f52b1758ed176b20329b4a2d66cd Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Wed, 10 Aug 2016 16:21:58 -0700 Subject: [PATCH] Update Dart SDK to `1.19.0-dev.4.0`. (#5329) --- bin/cache/dart-sdk.version | 2 +- packages/flutter_test/pubspec.yaml | 2 +- packages/flutter_tools/lib/src/dart/analysis.dart | 5 +++-- packages/flutter_tools/pubspec.yaml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/cache/dart-sdk.version b/bin/cache/dart-sdk.version index 20c4f32c405..32badbe880d 100644 --- a/bin/cache/dart-sdk.version +++ b/bin/cache/dart-sdk.version @@ -1 +1 @@ -1.19.0-dev.0.0 +1.19.0-dev.5.0 diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml index 1f98b7a0163..ce145bbc8ae 100644 --- a/packages/flutter_test/pubspec.yaml +++ b/packages/flutter_test/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: # We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do. # We pin the version of analyzer we depend on to avoid version skew across our # packages. - analyzer: 0.27.4-alpha.19 + analyzer: 0.27.5-alpha.0 flutter: path: ../flutter diff --git a/packages/flutter_tools/lib/src/dart/analysis.dart b/packages/flutter_tools/lib/src/dart/analysis.dart index 2b1a95b815d..fcd80630a53 100644 --- a/packages/flutter_tools/lib/src/dart/analysis.dart +++ b/packages/flutter_tools/lib/src/dart/analysis.dart @@ -9,8 +9,9 @@ import 'package:analyzer/file_system/file_system.dart' as file_system; 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/embedder.dart'; import 'package:analyzer/source/error_processor.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 import 'package:analyzer/src/generated/error.dart'; // ignore: implementation_imports import 'package:analyzer/src/generated/java_io.dart'; // ignore: implementation_imports @@ -99,7 +100,7 @@ class AnalysisDriver { EmbedderYamlLocator locator = new EmbedderYamlLocator(packageMap); if (locator.embedderYamls.isNotEmpty) { // Create and configure an embedded SDK. - EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls); + EmbedderSdk sdk = new EmbedderSdk(PhysicalResourceProvider.INSTANCE, locator.embedderYamls); // Fail fast if no URI mappings are found. assert(sdk.libraryMap.size() > 0); sdk.analysisOptions = context.analysisOptions; diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index e17264d14b6..b86e3123504 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: test: 0.12.15+1 # Pinned in flutter_test as well. - analyzer: 0.27.4-alpha.19 + analyzer: 0.27.5-alpha.0 dev_dependencies: mockito: ^0.11.0