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

Skip over flutter sdk packages when upgrading dependencies. (#12405)

Browse Source
This commit is contained in:
Alexander Aprelev 2017-10-04 17:50:10 -07:00 committed by GitHub
parent 5e7bcbacf8
commit d5ba4df6af
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter_tools/lib/src/commands/update_packages.dart
View File

@ -371,7 +371,6 @@ class PubspecYaml {
// dependency lines. // dependency lines.
if (!data.isTransitive) { if (!data.isTransitive) {
assert(!done.contains(data.name)); assert(!done.contains(data.name));
assert(versions.contains(data.name));
if (data.kind == DependencyKind.normal) { if (data.kind == DependencyKind.normal) {
// This is a regular dependency, so we need to update the // This is a regular dependency, so we need to update the
// version number. // version number.
@ -379,6 +378,7 @@ class PubspecYaml {
// We output data that matches the format that // We output data that matches the format that
// PubspecDependency.parse can handle. The data.suffix is any // PubspecDependency.parse can handle. The data.suffix is any
// previously-specified trailing comment. // previously-specified trailing comment.
assert(versions.contains(data.name));
output.add(' ${data.name}: ${versions.versionFor(data.name)}${data.suffix}'); output.add(' ${data.name}: ${versions.versionFor(data.name)}${data.suffix}');
} else { } else {
// If it wasn't a regular dependency, then we output the line // If it wasn't a regular dependency, then we output the line
@ -677,7 +677,8 @@ String _generateFakePubspec(Iterable<PubspecDependency> dependencies) {
result.writeln('dependencies:'); result.writeln('dependencies:');
overrides.writeln('dependency_overrides:'); overrides.writeln('dependency_overrides:');
for (PubspecDependency dependency in dependencies) for (PubspecDependency dependency in dependencies)
dependency.describeForFakePubspec(result, overrides); if (dependency.kind != DependencyKind.sdk)
dependency.describeForFakePubspec(result, overrides);
result.write(overrides.toString()); result.write(overrides.toString());
return result.toString(); return result.toString();
} }
@ -756,6 +757,11 @@ class PubDependencyTree {
/// excluding any listen in `seen`. /// excluding any listen in `seen`.
Iterable<String> getTransitiveDependenciesFor(String package, { Set<String> seen }) sync* { Iterable<String> getTransitiveDependenciesFor(String package, { Set<String> seen }) sync* {
seen ??= new Set<String>(); seen ??= new Set<String>();
if (!_dependencyTree.containsKey(package)) {
// We have no transitive dependencies extracted for flutter_sdk packages
// because they were omitted from pubspec.yaml used for 'pub upgrade' run.
return;
}
for (String dependency in _dependencyTree[package]) { for (String dependency in _dependencyTree[package]) {
if (!seen.contains(dependency)) { if (!seen.contains(dependency)) {
yield dependency; yield dependency;