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

Update tools to use analyzer from vended Dart SDK. (#5900)

Browse Source 
* Update tools to use `analyzer` from vended Dart SDK.

* updates `flutter_tools` and `flutter_test` to use the SDK-vended `analyzer` package
* tweaks dependency tracking logic to only record the SDK-vended `analyzer` so as not to crash on spurious conflicts (due to transitive dependencies)

* Review fixes.
This commit is contained in:
Phil Quitslund 2016-09-16 11:06:17 -07:00 committed by GitHub
parent b1a7720315
commit fffde14f64
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev/devicelab/pubspec.yaml
View File

@ -13,10 +13,15 @@ dependencies:
path: ^1.3.0
stack_trace: ^1.4.0
vm_service_client: '^0.2.0'
# See packages/flutter_test/pubspec.yaml for why we're pinning this version
analyzer: 0.28.2-alpha.0
# Pulled in via dependency_override below.
analyzer: any
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.15+4
# See packages/flutter_test/pubspec.yaml for why we're using an override.
dependency_overrides:
analyzer:
path: ../../bin/cache/dart-sdk/lib/analyzer

10
packages/flutter_test/pubspec.yaml
View File

@ -8,9 +8,13 @@ dependencies:
test: 0.12.15+4
# 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.28.2-alpha.0
# Like 'flutter_tools', we use the version of the analyzer in the vended Dart
# SDK as defined in the `dependency_overrides` below.
analyzer: any
flutter:
path: ../flutter
dependency_overrides:
analyzer:
path: ../../bin/cache/dart-sdk/lib/analyzer

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

@ -179,8 +179,15 @@ class AnalyzeCommand extends FlutterCommand {
.where((String line) => !line.startsWith(new RegExp(r'^ *#')))
.forEach((String line) {
int colon = line.indexOf(':');
if (colon > 0)
dependencies.add(line.substring(0, colon), path.normalize(path.absolute(directory.path, path.fromUri(line.substring(colon+1)))), dotPackagesPath);
if (colon > 0) {
String packageName = line.substring(0, colon);
String packagePath = 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 path directive).
// Analyzer package versions reached via transitive dependencies (e.g., via `test`) are ignored since they would produce
// spurious conflicts.
if (packageName != 'analyzer' || packagePath.startsWith('..'))
dependencies.add(packageName, path.normalize(path.absolute(directory.path, path.fromUri(packagePath))), dotPackagesPath);
}
});
}
}

8
packages/flutter_tools/pubspec.yaml
View File

@ -38,8 +38,8 @@ dependencies:
# precisely.
test: 0.12.15+4
# Pinned in flutter_test as well.
analyzer: 0.28.2-alpha.0
# Version from the vended Dart SDK as defined in `dependency_overrides`.
analyzer: any
dev_dependencies:
mockito: ^1.0.0
@ -47,3 +47,7 @@ dev_dependencies:
# Exclude this package from the hosted API docs.
dartdoc:
nodoc: true
dependency_overrides:
analyzer:
path: ../../bin/cache/dart-sdk/lib/analyzer