Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(878)

Unified Diff: sdk/lib/_internal/pub/lib/src/solver/version_solver.dart

Issue 74013007: Hook up dependency overrides to the rest of pub. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Revise. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
diff --git a/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart b/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
index 30bd2d09ecd6f7b38373336b29855195b5c3f4d6..54c5ab466e15115b8ff41bf67a3ba6fce216eabf 100644
--- a/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
+++ b/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
@@ -25,14 +25,12 @@ import 'backtracking_solver.dart';
/// packages will be used. This is for forcing an upgrade to one or more
/// packages.
Future<SolveResult> resolveVersions(SourceRegistry sources, Package root,
- {LockFile lockFile, List<PackageRef> overrides, List<String> useLatest}) {
+ {LockFile lockFile, List<String> useLatest}) {
if (lockFile == null) lockFile = new LockFile.empty();
- if (overrides == null) overrides = [];
if (useLatest == null) useLatest = [];
return log.progress('Resolving dependencies', () {
- return new BacktrackingSolver(sources, root, lockFile, overrides,
- useLatest).solve();
+ return new BacktrackingSolver(sources, root, lockFile, useLatest).solve();
});
}
@@ -45,6 +43,9 @@ class SolveResult {
/// reachable from the root, or `null` if the solver failed.
final List<PackageId> packages;
+ /// The dependency overrides that were used in the solution.
+ final List<PackageDep> overrides;
+
/// The error that prevented the solver from finding a solution or `null` if
/// it was successful.
final SolveFailure error;
@@ -55,7 +56,8 @@ class SolveResult {
/// solution.
final int attemptedSolutions;
- SolveResult(this.packages, this.error, this.attemptedSolutions);
+ SolveResult(this.packages, this.overrides, this.error,
+ this.attemptedSolutions);
String toString() {
if (!succeeded) {
« no previous file with comments | « sdk/lib/_internal/pub/lib/src/solver/backtracking_solver.dart ('k') | sdk/lib/_internal/pub/lib/src/validator.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698