firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump to Dart SDK 1.24.0-dev.6.7. (#10585)

Browse Source 
* Bump to Dart SDK 1.24.0-dev.6.7.

* nits and fixes
This commit is contained in:
Phil Quitslund 2017-06-08 15:15:18 -07:00 committed by GitHub
parent 1eaefe1837
commit 95544383ef
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/internal/dart-sdk.version
View File

@ -1 +1 @@
1.24.0-dev.3.0 1.24.0-dev.6.7

2
dev/devicelab/pubspec.yaml
View File

@ -17,4 +17,4 @@ dependencies:
dev_dependencies: dev_dependencies:
# See packages/flutter_test/pubspec.yaml for why we're pinning this version. # See packages/flutter_test/pubspec.yaml for why we're pinning this version.
test: 0.12.20 test: 0.12.21

2
packages/flutter_driver/pubspec.yaml
View File

@ -21,6 +21,6 @@ dependencies:
sdk: flutter sdk: flutter
dev_dependencies: dev_dependencies:
test: 0.12.20 test: 0.12.21
mockito: ^2.0.2 mockito: ^2.0.2
quiver: ^0.24.0 quiver: ^0.24.0

2
packages/flutter_test/pubspec.yaml
View File

@ -4,7 +4,7 @@ dependencies:
# The flutter tools depend on very specific internal implementation # The flutter tools depend on very specific internal implementation
# details of the 'test' package, which change between versions, so # details of the 'test' package, which change between versions, so
# here we pin it precisely to avoid version skew across our packages. # here we pin it precisely to avoid version skew across our packages.
test: 0.12.20 test: 0.12.21
# We use FakeAsync and other testing utilities. # We use FakeAsync and other testing utilities.
quiver: ^0.24.0 quiver: ^0.24.0

11
packages/flutter_tools/lib/src/commands/analyze_once.dart
View File

@ -31,6 +31,9 @@ class AnalyzeOnce extends AnalyzeBase {
/// The working directory for testing analysis using dartanalyzer /// The working directory for testing analysis using dartanalyzer
final Directory workingDirectory; final Directory workingDirectory;
/// Packages whose source is defined in the vended SDK.
static const List<String> _vendedSdkPackages = const <String>['analyzer', 'front_end', 'kernel'];
@override @override
Future<Null> analyze() async { Future<Null> analyze() async {
final Stopwatch stopwatch = new Stopwatch()..start(); final Stopwatch stopwatch = new Stopwatch()..start();
@ -158,10 +161,10 @@ class AnalyzeOnce extends AnalyzeBase {
if (colon > 0) { if (colon > 0) {
final String packageName = line.substring(0, colon); final String packageName = line.substring(0, colon);
final String packagePath = fs.path.fromUri(line.substring(colon+1)); final String packagePath = fs.path.fromUri(line.substring(colon+1));
// Ensure that we only add the `analyzer` package defined in the vended SDK (and referred to with a local fs.path. directive). // Ensure that we only add `analyzer` and dependent packages defined in the vended SDK (and referred to with a local
// Analyzer package versions reached via transitive dependencies (e.g., via `test`) are ignored since they would produce // fs.path. directive). Analyzer package versions reached via transitive dependencies (e.g., via `test`) are ignored
// spurious conflicts. // since they would produce spurious conflicts.
if (packageName != 'analyzer' || packagePath.startsWith('..')) if (!_vendedSdkPackages.contains(packageName) || packagePath.startsWith('..'))
dependencies.add(packageName, fs.path.normalize(fs.path.absolute(directory.path, packagePath)), dotPackagesPath); dependencies.add(packageName, fs.path.normalize(fs.path.absolute(directory.path, packagePath)), dotPackagesPath);
} }
}); });

2
packages/flutter_tools/pubspec.yaml
View File

@ -33,7 +33,7 @@ dependencies:
# We depend on very specific internal implementation details of the # We depend on very specific internal implementation details of the
# 'test' package, which change between versions, so here we pin it # 'test' package, which change between versions, so here we pin it
# precisely. # precisely.
test: 0.12.20 test: 0.12.21
# Version from the vended Dart SDK as defined in `dependency_overrides`. # Version from the vended Dart SDK as defined in `dependency_overrides`.
analyzer: any analyzer: any