Index: utils/pub/entrypoint.dart |
diff --git a/utils/pub/entrypoint.dart b/utils/pub/entrypoint.dart |
index 95790d3bd419ddf1a38e49f8b8bb2a4982e76559..976b19330c9489be63abff880edbbf28fbce4aee 100644 |
--- a/utils/pub/entrypoint.dart |
+++ b/utils/pub/entrypoint.dart |
@@ -17,7 +17,7 @@ import 'sdk.dart' as sdk; |
import 'system_cache.dart'; |
import 'utils.dart'; |
import 'version.dart'; |
-import 'version_solver.dart'; |
+import 'solver/version_solver.dart'; |
/// Pub operates over a directed graph of dependencies that starts at a root |
/// "entrypoint" package. This is typically the package where the current |
@@ -103,7 +103,7 @@ class Entrypoint { |
/// completes when all dependencies are installed. |
Future installDependencies() { |
return defer(() { |
- return resolveVersions(cache.sources, root, loadLockFile()); |
+ return resolveVersions(cache.sources, root, lockFile: loadLockFile()); |
}).then(_installDependencies); |
} |
@@ -111,8 +111,7 @@ class Entrypoint { |
/// package to its "package" directory, writing a new [LockFile]. Returns a |
/// [Future] that completes when all dependencies are installed. |
Future updateAllDependencies() { |
- return resolveVersions(cache.sources, root, new LockFile.empty()) |
- .then(_installDependencies); |
+ return resolveVersions(cache.sources, root).then(_installDependencies); |
} |
/// Installs the latest available versions of [dependencies], while leaving |
@@ -120,11 +119,8 @@ class Entrypoint { |
/// [Future] that completes when all dependencies are installed. |
Future updateDependencies(List<String> dependencies) { |
return defer(() { |
- var solver = new VersionSolver(cache.sources, root, loadLockFile()); |
- for (var dependency in dependencies) { |
- solver.useLatestVersion(dependency); |
- } |
- return solver.solve(); |
+ return resolveVersions(cache.sources, root, |
+ lockFile: loadLockFile(), useLatest: dependencies); |
}).then(_installDependencies); |
} |