isUpToDate based on package_config.json

lib/pub.dart

@@ -40,13 +40,11 @@ Command<int> pubCommand({required bool Function() isVerbose}) =>
 Future<void> ensurePubspecResolved(
   String dir, {
   bool isOffline = false,
-  bool checkForSdkUpdate = false,
   bool summaryOnly = true,
   bool onlyOutputWhenTerminal = true,
 }) async {
   try {
     await Entrypoint(dir, SystemCache(isOffline: isOffline)).ensureUpToDate(
-      checkForSdkUpdate: checkForSdkUpdate,
       summaryOnly: summaryOnly,
       onlyOutputWhenTerminal: onlyOutputWhenTerminal,
     );

lib/src/executable.dart

@@ -308,7 +308,7 @@ Future<DartExecutableWithPackageConfig> getExecutableForCommand(
   }
   final entrypoint = Entrypoint(root, SystemCache(rootDir: pubCacheDir));
   try {
-    await entrypoint.ensureUpToDate(checkForSdkUpdate: true);
+    await entrypoint.ensureUpToDate();
   } on ApplicationException catch (e) {
     throw CommandResolutionFailedException._(
       e.toString(),

lib/src/io.dart

@@ -977,7 +977,10 @@ T _doProcess<T>(
 }
 
 /// Updates [path]'s modification time.
-void touch(String path) => File(path).setLastModifiedSync(DateTime.now());
+void touch(String path) {
+  log.fine('Touching `$path`');
+  File(path).setLastModifiedSync(DateTime.now());
+}
 
 /// Creates a temporary directory and passes its path to [fn].
 ///

test/add/sdk/sdk_test.dart

@@ -47,13 +47,17 @@ void main() {
       }),
     ]).validate();
 
-    await d.appPackageConfigFile([
-      d.packageConfigEntry(
-        name: 'foo',
-        path: p.join(d.sandbox, 'flutter', 'packages', 'foo'),
-      ),
-      d.packageConfigEntry(name: 'bar', version: '1.0.0'),
-    ]).validate();
+    await d.appPackageConfigFile(
+      [
+        d.packageConfigEntry(
+          name: 'foo',
+          path: p.join(d.sandbox, 'flutter', 'packages', 'foo'),
+        ),
+        d.packageConfigEntry(name: 'bar', version: '1.0.0'),
+      ],
+      flutterRoot: p.join(d.sandbox, 'flutter'),
+      flutterVersion: '1.2.3',
+    ).validate();
   });
 
   test(
@@ -73,13 +77,17 @@ void main() {
         },
       }),
     ]).validate();
-    await d.appPackageConfigFile([
-      d.packageConfigEntry(
-        name: 'foo',
-        path: p.join(d.sandbox, 'flutter', 'packages', 'foo'),
-      ),
-      d.packageConfigEntry(name: 'bar', version: '1.0.0'),
-    ]).validate();
+    await d.appPackageConfigFile(
+      [
+        d.packageConfigEntry(
+          name: 'foo',
+          path: p.join(d.sandbox, 'flutter', 'packages', 'foo'),
+        ),
+        d.packageConfigEntry(name: 'bar', version: '1.0.0'),
+      ],
+      flutterRoot: p.join(d.sandbox, 'flutter'),
+      flutterVersion: '1.2.3',
+    ).validate();
   });
 
   test('adds an SDK dependency from bin/cache/pkg', () async {
@@ -89,12 +97,16 @@ void main() {
       environment: {'FLUTTER_ROOT': p.join(d.sandbox, 'flutter')},
     );
 
-    await d.appPackageConfigFile([
-      d.packageConfigEntry(
-        name: 'baz',
-        path: p.join(d.sandbox, 'flutter', 'bin', 'cache', 'pkg', 'baz'),
-      ),
-    ]).validate();
+    await d.appPackageConfigFile(
+      [
+        d.packageConfigEntry(
+          name: 'baz',
+          path: p.join(d.sandbox, 'flutter', 'bin', 'cache', 'pkg', 'baz'),
+        ),
+      ],
+      flutterRoot: p.join(d.sandbox, 'flutter'),
+      flutterVersion: '1.2.3',
+    ).validate();
   });
 
   test("fails if the version constraint doesn't match", () async {

test/descriptor.dart

@@ -311,12 +311,27 @@ DirectoryDescriptor appDir({Map? dependencies, Map<String, Object>? pubspec}) =>
 Descriptor packageConfigFile(
   List<PackageConfigEntry> packages, {
   String generatorVersion = '3.1.2+3',
+  String? pubCache,
+  String? flutterVersion,
+  String? flutterRoot,
 }) =>
-    PackageConfigFileDescriptor(packages, generatorVersion);
+    PackageConfigFileDescriptor(
+      packages,
+      generatorVersion,
+      pubCache ??
+          p.join(
+            sandbox,
+            cachePath,
+          ),
+      flutterRoot,
+      flutterVersion,
+    );
 
 Descriptor appPackageConfigFile(
   List<PackageConfigEntry> packages, {
   String generatorVersion = '3.1.2+3',
+  String? flutterRoot,
+  String? flutterVersion,
 }) =>
     dir(
       appPath,
@@ -327,6 +342,8 @@ Descriptor appPackageConfigFile(
             ...packages,
           ],
           generatorVersion: generatorVersion,
+          flutterRoot: flutterRoot,
+          flutterVersion: flutterVersion,
         ),
       ],
     );

test/descriptor/package_config.dart

@@ -15,6 +15,9 @@ import 'package:test_descriptor/test_descriptor.dart';
 /// Describes a `.dart_tools/package_config.json` file and its contents.
 class PackageConfigFileDescriptor extends Descriptor {
   final String _generatorVersion;
+  final String _pubCache;
+  final String? _flutterRoot;
+  final String? _flutterVersion;
 
   /// A map describing the packages in this `package_config.json` file.
   final List<PackageConfigEntry> _packages;
@@ -26,14 +29,25 @@ class PackageConfigFileDescriptor extends Descriptor {
       generatorVersion: Version.parse(_generatorVersion),
       generator: 'pub',
       generated: DateTime.now().toUtc(),
+      additionalProperties: {
+        'pubCache': p.toUri(_pubCache).toString(),
+        if (_flutterRoot != null)
+          'flutterRoot': p.toUri(_flutterRoot).toString(),
+        if (_flutterVersion != null) 'flutterVersion': _flutterVersion,
+      },
     );
   }
 
   /// Describes a `.dart_tools/package_config.json` file
   /// with the given list of package configurations and
   /// generated with specified version.
-  PackageConfigFileDescriptor(this._packages, this._generatorVersion)
-      : super('.dart_tool/package_config.json');
+  PackageConfigFileDescriptor(
+    this._packages,
+    this._generatorVersion,
+    this._pubCache,
+    this._flutterRoot,
+    this._flutterVersion,
+  ) : super('.dart_tool/package_config.json');
 
   @override
   Future<void> create([String? parent]) async {

test/embedding/ensure_pubspec_resolved.dart

@@ -202,8 +202,7 @@ void testEnsurePubspecResolved() {
         // Ensure that the pubspec looks newer than the lockfile.
         await _touch('pubspec.yaml');
 
-        await _implicitPubGet('The pubspec.yaml file has changed since the '
-            'pubspec.lock file was generated');
+        await _implicitPubGet('`pubspec.yaml` is newer than `pubspec.lock`');
       });
 
       test('the package_config.json file points to the wrong place', () async {
@@ -235,8 +234,7 @@ void testEnsurePubspecResolved() {
         // Ensure that the pubspec looks newer than the lockfile.
         await _touch('pubspec.lock');
 
-        await _implicitPubGet('The pubspec.lock file has changed since the '
-            '.dart_tool/package_config.json file was generated');
+        await _implicitPubGet('Could not find `../foo/pubspec.yaml`');
       });
 
       test("the lock file's SDK constraint doesn't match the current SDK",
@@ -270,8 +268,8 @@ void testEnsurePubspecResolved() {
         );
 
         await _implicitPubGet(
-            "Dart 3.1.2+3 is incompatible with your dependencies' "
-            'SDK constraints');
+          'The Dart SDK was updated since last package resolution.',
+        );
       });
 
       test(
@@ -314,7 +312,7 @@ void testEnsurePubspecResolved() {
         );
 
         await _implicitPubGet(
-          'Flutter 0.9.0 is incompatible with your dependencies\' SDK constraints',
+          'Flutter has updated since last invocation.',
           environment: {'FLUTTER_ROOT': p.join(d.sandbox, 'flutter')},
         );
       });
@@ -340,6 +338,9 @@ void testEnsurePubspecResolved() {
           d.libPubspec('bar', '1.0.0', deps: {'foo': '2.0.0'}),
         ]).create();
 
+        // To ensure the timestamp is strictly later we need to touch again here.
+        await _touch(p.join(d.sandbox, 'bar', 'pubspec.yaml'));
+
         await _implicitPubGet('../bar/pubspec.yaml has changed '
             'since the pubspec.lock file was generated.');
       });
@@ -377,6 +378,8 @@ void testEnsurePubspecResolved() {
             sdk: '>= 2.100.0 <=4.0.0', // tests runs with '3.1.2+3'
           ),
         ]).create();
+        // To ensure the timestamp is strictly later we need to touch again here.
+        await _touch(p.join(d.sandbox, 'bar', 'pubspec.yaml'));
 
         await _implicitPubGet('../bar/pubspec.yaml has changed '
             'since the pubspec.lock file was generated.');
@@ -497,38 +500,6 @@ void testEnsurePubspecResolved() {
 
         await _noImplicitPubGet();
       });
-
-      test('the lock file has a Flutter SDK but Flutter is unavailable',
-          () async {
-        // Avoid using a path dependency because it triggers the full validation
-        // logic. We want to be sure SDK-validation works without that logic.
-        server.serve(
-          'foo',
-          '3.0.0',
-          pubspec: {
-            'environment': {
-              'flutter': '>=1.0.0 <2.0.0',
-              'sdk': defaultSdkConstraint,
-            },
-          },
-        );
-
-        await d.dir('flutter', [d.flutterVersion('1.2.3')]).create();
-
-        await d.dir(appPath, [
-          d.appPubspec(dependencies: {'foo': '3.0.0'}),
-        ]).create();
-
-        await pubGet(
-          environment: {'FLUTTER_ROOT': p.join(d.sandbox, 'flutter')},
-        );
-
-        await d.dir('flutter', [d.flutterVersion('2.4.6')]).create();
-
-        // Run pub manually here because otherwise we don't have access to
-        // d.sandbox.
-        await runPub(args: ['run', 'bin/script.dart']);
-      });
     });
   });
 }

test/sdk_test.dart

@@ -43,13 +43,17 @@ void main() {
         command,
         environment: {'FLUTTER_ROOT': p.join(d.sandbox, 'flutter')},
       );
-      await d.appPackageConfigFile([
-        d.packageConfigEntry(
-          name: 'foo',
-          path: p.join(d.sandbox, 'flutter', 'packages', 'foo'),
-        ),
-        d.packageConfigEntry(name: 'bar', version: '1.0.0'),
-      ]).validate();
+      await d.appPackageConfigFile(
+        [
+          d.packageConfigEntry(
+            name: 'foo',
+            path: p.join(d.sandbox, 'flutter', 'packages', 'foo'),
+          ),
+          d.packageConfigEntry(name: 'bar', version: '1.0.0'),
+        ],
+        flutterRoot: p.join(d.sandbox, 'flutter'),
+        flutterVersion: '1.2.3',
+      ).validate();
     });
 
     test('gets an SDK dependency from bin/cache/pkg', () async {
@@ -63,12 +67,16 @@ void main() {
         environment: {'FLUTTER_ROOT': p.join(d.sandbox, 'flutter')},
       );
 
-      await d.appPackageConfigFile([
-        d.packageConfigEntry(
-          name: 'baz',
-          path: p.join(d.sandbox, 'flutter', 'bin', 'cache', 'pkg', 'baz'),
-        ),
-      ]).validate();
+      await d.appPackageConfigFile(
+        [
+          d.packageConfigEntry(
+            name: 'baz',
+            path: p.join(d.sandbox, 'flutter', 'bin', 'cache', 'pkg', 'baz'),
+          ),
+        ],
+        flutterRoot: p.join(d.sandbox, 'flutter'),
+        flutterVersion: '1.2.3',
+      ).validate();
     });
 
     test('unlocks an SDK dependency when the version changes', () async {
@@ -116,7 +124,11 @@ void main() {
         command,
         environment: {'FLUTTER_ROOT': p.join(d.sandbox, 'flutter')},
       );
-      await d.appPackageConfigFile([]).validate();
+      await d.appPackageConfigFile(
+        [],
+        flutterRoot: p.join(d.sandbox, 'flutter'),
+        flutterVersion: '1.2.3',
+      ).validate();
     });
 
     group('fails if', () {

test/testdata/goldens/directory_option_test/commands taking a --directory~-C parameter work.txt

@@ -95,6 +95,10 @@ Got dependencies in myapp/example.
 
 ## Section 10
 $ pub run -C myapp 'bin/app.dart'
+Resolving dependencies in myapp...
+Got dependencies in myapp.
+Resolving dependencies in myapp...
+Got dependencies in myapp.
 Building package executable...
 Built test_pkg:app.
 Hi
@@ -139,6 +143,8 @@ $ pub uploader -C myapp add [email protected]
 
 ## Section 13
 $ pub deps -C myapp
+Resolving dependencies in myapp...
+Got dependencies in myapp.
 Dart SDK 3.1.2+3
 test_pkg 1.0.0
 └── foo 1.0.0

test/testdata/goldens/embedding/embedding_test/logfile is written with --verbose and on unexpected exceptions.txt

@@ -122,7 +122,8 @@ MSG : Logs written to $SANDBOX/cache/log/pub_log.txt.
 [E]    |   ],
 [E]    |   "generated": "$TIME",
 [E]    |   "generator": "pub",
-[E]    |   "generatorVersion": "3.1.2+3"
+[E]    |   "generatorVersion": "3.1.2+3",
+[E]    |   "pubCache": "file://$SANDBOX/cache"
 [E]    | }
 [E] IO  : Writing $N characters to text file $SANDBOX/cache/log/pub_log.txt.
 
@@ -283,7 +284,8 @@ FINE: Contents:
    |   ],
    |   "generated": "$TIME",
    |   "generator": "pub",
-   |   "generatorVersion": "3.1.2+3"
+   |   "generatorVersion": "3.1.2+3",
+   |   "pubCache": "file://$SANDBOX/cache"
    | }
 ---- End log transcript ----
 -------------------------------- END OF OUTPUT ---------------------------------