| Index: lib/src/solver/backtracking_solver.dart
|
| diff --git a/lib/src/solver/backtracking_solver.dart b/lib/src/solver/backtracking_solver.dart
|
| index 6b831ee5bbdf8ae61b543d2999a09c9502448f69..97595fadd1110ea7b0718fb7eb8ca2211b111b41 100644
|
| --- a/lib/src/solver/backtracking_solver.dart
|
| +++ b/lib/src/solver/backtracking_solver.dart
|
| @@ -47,6 +47,7 @@ import '../package.dart';
|
| import '../pubspec.dart';
|
| import '../sdk.dart' as sdk;
|
| import '../source_registry.dart';
|
| +import '../source/hosted.dart';
|
| import '../source/unknown.dart';
|
| import '../utils.dart';
|
| import 'version_queue.dart';
|
| @@ -122,7 +123,7 @@ class BacktrackingSolver {
|
| final Pubspec _implicitPubspec = () {
|
| var dependencies = [];
|
| barback.pubConstraints.forEach((name, constraint) {
|
| - dependencies.add(new PackageDep(name, "hosted", constraint, name));
|
| + dependencies.add(HostedSource.refFor(name).withConstraint(constraint));
|
| });
|
|
|
| return new Pubspec("pub itself", dependencies: dependencies);
|
| @@ -174,11 +175,8 @@ class BacktrackingSolver {
|
| pubspecs[id.name] = await _getPubspec(id);
|
| }
|
|
|
| - var resolved = await Future.wait(
|
| - packages.map((id) => sources[id.source].resolveId(id)));
|
| -
|
| - return new SolveResult.success(sources, root, lockFile, resolved,
|
| - overrides, pubspecs, _getAvailableVersions(resolved),
|
| + return new SolveResult.success(sources, root, lockFile, packages,
|
| + overrides, pubspecs, _getAvailableVersions(packages),
|
| _attemptedSolutions);
|
| } on SolveFailure catch (error) {
|
| // Wrap a failure in a result so we can attach some other data.
|
|
|