firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] flutter precache downloads all enabled platforms if no flags are provided (#73733)

Browse Source
This commit is contained in:
Jonah Williams 2021-01-11 14:29:02 -08:00 committed by GitHub
parent 7ed30cb7e5
commit f7dc19eb23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/flutter_tools/lib/src/commands/precache.dart
View File

@ -28,19 +28,19 @@ class PrecacheCommand extends FlutterCommand {
help: 'Precache artifacts for all host platforms.'); help: 'Precache artifacts for all host platforms.');
argParser.addFlag('force', abbr: 'f', negatable: false, argParser.addFlag('force', abbr: 'f', negatable: false,
help: 'Force re-downloading of artifacts.'); help: 'Force re-downloading of artifacts.');
argParser.addFlag('android', negatable: true, defaultsTo: true, argParser.addFlag('android', negatable: true, defaultsTo: false,
help: 'Precache artifacts for Android development.', help: 'Precache artifacts for Android development.',
hide: verboseHelp); hide: verboseHelp);
argParser.addFlag('android_gen_snapshot', negatable: true, defaultsTo: true, argParser.addFlag('android_gen_snapshot', negatable: true, defaultsTo: false,
help: 'Precache gen_snapshot for Android development.', help: 'Precache gen_snapshot for Android development.',
hide: !verboseHelp); hide: !verboseHelp);
argParser.addFlag('android_maven', negatable: true, defaultsTo: true, argParser.addFlag('android_maven', negatable: true, defaultsTo: false,
help: 'Precache Gradle dependencies for Android development.', help: 'Precache Gradle dependencies for Android development.',
hide: !verboseHelp); hide: !verboseHelp);
argParser.addFlag('android_internal_build', negatable: true, defaultsTo: false, argParser.addFlag('android_internal_build', negatable: true, defaultsTo: false,
help: 'Precache dependencies for internal Android development.', help: 'Precache dependencies for internal Android development.',
hide: !verboseHelp); hide: !verboseHelp);
argParser.addFlag('ios', negatable: true, defaultsTo: true, argParser.addFlag('ios', negatable: true, defaultsTo: false,
help: 'Precache artifacts for iOS development.'); help: 'Precache artifacts for iOS development.');
argParser.addFlag('web', negatable: true, defaultsTo: false, argParser.addFlag('web', negatable: true, defaultsTo: false,
help: 'Precache artifacts for web development.'); help: 'Precache artifacts for web development.');
@ -69,7 +69,9 @@ class PrecacheCommand extends FlutterCommand {
final String name = 'precache'; final String name = 'precache';
@override @override
final String description = "Populate the Flutter tool's cache of binary artifacts."; final String description = "Populate the Flutter tool's cache of binary artifacts.\n\n"
'If no explicit platform flags are provided, this command will download the artifacts '
'for all currently enabled platforms';
@override @override
bool get shouldUpdateCache => false; bool get shouldUpdateCache => false;
@ -143,7 +145,12 @@ class PrecacheCommand extends FlutterCommand {
if (boolArg('use-unsigned-mac-binaries')) { if (boolArg('use-unsigned-mac-binaries')) {
_cache.useUnsignedMacBinaries = true; _cache.useUnsignedMacBinaries = true;
} }
_cache.platformOverrideArtifacts = _explicitArtifactSelections(); final Set<String> explicitlyEnabled = _explicitArtifactSelections();
_cache.platformOverrideArtifacts = explicitlyEnabled;
// If the user did not provide any artifact flags, then download
// all artifacts that correspond to an enabled platform.
final bool downloadDefaultArtifacts = explicitlyEnabled.isEmpty;
final Map<String, String> umbrellaForArtifact = _umbrellaForArtifactMap(); final Map<String, String> umbrellaForArtifact = _umbrellaForArtifactMap();
final Set<DevelopmentArtifact> requiredArtifacts = <DevelopmentArtifact>{}; final Set<DevelopmentArtifact> requiredArtifacts = <DevelopmentArtifact>{};
for (final DevelopmentArtifact artifact in DevelopmentArtifact.values) { for (final DevelopmentArtifact artifact in DevelopmentArtifact.values) {
@ -152,7 +159,7 @@ class PrecacheCommand extends FlutterCommand {
} }
final String argumentName = umbrellaForArtifact[artifact.name] ?? artifact.name; final String argumentName = umbrellaForArtifact[artifact.name] ?? artifact.name;
if (includeAllPlatforms || boolArg(argumentName)) { if (includeAllPlatforms || boolArg(argumentName) || downloadDefaultArtifacts) {
requiredArtifacts.add(artifact); requiredArtifacts.add(artifact);
} }
} }

29
packages/flutter_tools/test/commands.shard/hermetic/precache_test.dart
View File

@ -268,6 +268,7 @@ void main() {
const <String>[ const <String>[
'precache', 'precache',
'--no-ios', '--no-ios',
'--android',
'--android_gen_snapshot', '--android_gen_snapshot',
'--android_maven', '--android_maven',
'--android_internal_build', '--android_internal_build',
@ -403,6 +404,34 @@ void main() {
verify(cache.clearStampFiles()).called(1); verify(cache.clearStampFiles()).called(1);
}); });
testUsingContext('precache downloads all enabled platforms if no flags are provided.', () async {
final PrecacheCommand command = PrecacheCommand(
cache: cache,
logger: BufferLogger.test(),
featureFlags: TestFeatureFlags(
isWebEnabled: true,
isLinuxEnabled: true,
isWindowsEnabled: true,
isMacOSEnabled: true,
isIOSEnabled: false,
isAndroidEnabled: false,
),
platform: FakePlatform(environment: <String, String>{}),
);
await createTestCommandRunner(command).run(const <String>['precache']);
expect(
artifacts,
unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.web,
DevelopmentArtifact.macOS,
DevelopmentArtifact.windows,
DevelopmentArtifact.linux,
DevelopmentArtifact.universal,
// iOS and android specifically excluded
}));
});
} }
class MockCache extends Mock implements Cache {} class MockCache extends Mock implements Cache {}