dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[deps] rev protobuf, test

Browse Source 
Revisions updated by `dart tools/rev_sdk_deps.dart`.

protobuf (https://github.com/dart-lang/protobuf/compare/b7753f6..deda288):
  deda288  2025-05-19  Devon Carew  address a merge issue with the protoc_plugin changelog (dart-lang/protobuf#1002)
  5ed4611  2025-05-19  Devon Carew  shorten the deprecation messages for clone() and copyWith() (dart-lang/protobuf#999)
  4960b92  2025-05-19  Ömer Sinan Ağacan  Switch to pub workspace (dart-lang/protobuf#1001)

test (https://github.com/dart-lang/test/compare/b9c59ea..5ffcb36):
  5ffcb36f  2025-05-19  Danny Tuppeny  Fix an issue with failed assertions using setUpAll/tearDownAll (dart-lang/test#2499)

Change-Id: Idc43e2f2fd9dc38b80917b25b45bb954076dc1c9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429480
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
This commit is contained in:
Devon Carew
2025-05-19 14:45:22 -07:00
committed by Commit Queue
parent b3beefb5bd
commit 40323dfaaf
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/package_deps/bin/package_deps.dart
+26 -20
View File
@@ -193,13 +193,6 @@ class Package implements Comparable<Package> {
var devdeps = devDependencies;
devdeps.remove(packageName);
// if (deps.isNotEmpty) {
// print(' deps : ${deps}');
// }
// if (devdeps.isNotEmpty) {
// print(' dev deps: ${devdeps}');
// }
void out(String message) {
logger.stdout(logger.ansi.emphasized(message));
}
@@ -467,22 +460,35 @@ class SdkDeps {
void _findPackages(Directory dir) {
var pubspec = File(path.join(dir.path, 'pubspec.yaml'));
if (pubspec.existsSync()) {
var doc = yaml.loadYamlDocument(pubspec.readAsStringSync());
var contents = doc.contents as yaml.YamlMap;
var name = contents['name'];
var version = contents['version'];
var dep = ResolvedDep(
packageName: name,
relativePath: path.relative(dir.path),
version: version == null ? null : Version.parse(version),
);
_resolvedPackageVersions[name] = dep;
} else {
// Continue to recurse.
for (var subDir in dir.listSync().whereType<Directory>()) {
_findPackages(subDir);
if (doc.contents is! yaml.YamlMap) {
// Stop recursing.
return;
}
var contents = doc.contents as yaml.YamlMap;
final isWorkspace = contents.containsKey('workspace');
if (!isWorkspace) {
var name = contents['name'];
var version = contents['version'];
var dep = ResolvedDep(
packageName: name,
relativePath: path.relative(dir.path),
version: version == null ? null : Version.parse(version),
);
_resolvedPackageVersions[name] = dep;
// We've found a leaf package - stop recursing.
return;
}
}
// Continue to recurse.
for (var subDir in dir.listSync().whereType<Directory>()) {
_findPackages(subDir);
}
}
}