Skip to content

[tool] Support --flavor option for flutter install. #114048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 17 commits into from
Nov 8, 2022
Merged

[tool] Support --flavor option for flutter install. #114048

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
847ede8
Alphabetize setup calls
Oct 25, 2022
423d67b
Add --flavor as an option for install
Oct 25, 2022
6e1b339
Add verbose logging in install command
Oct 26, 2022
8a9c83c
Test that flavors build succeeds with proper flavor and fails with bo…
Oct 26, 2022
33808fe
Remove unused import
Oct 26, 2022
3c51ad8
The import was used...
Oct 31, 2022
7daf8fe
SQUASH
Nov 1, 2022
f703ba3
Add flavor install test
Nov 1, 2022
619bfe4
Rename test
Nov 2, 2022
9cddf71
Add flavors install integration tests
Nov 2, 2022
19e503b
correct error message
Nov 3, 2022
5be125d
remove unused imports
Nov 3, 2022
57a54e4
Delete copy test
Nov 3, 2022
ec2580f
update test target
Nov 3, 2022
cde4f66
Refactor mechanism to read buildInfo
Nov 3, 2022
be3b24b
Remove unused import
Nov 3, 2022
388a70b
Set affected test targets to bringup: true
Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add verbose logging in install command
  • Loading branch information
a-wallen committed Nov 3, 2022
commit 6e1b33988d2812ec719158fecb34d8012b2de2d8
4 changes: 3 additions & 1 deletion packages/flutter_tools/lib/executable.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ List<FlutterCommand> generateCommands({
artifacts: globals.artifacts!,
processManager: globals.processManager,
),
InstallCommand(),
InstallCommand(
verboseHelp: verboseHelp,
),
LogsCommand(),
MakeHostAppEditableCommand(),
PackagesCommand(),
Expand Down
6 changes: 4 additions & 2 deletions packages/flutter_tools/lib/src/commands/install.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ import '../globals.dart' as globals;
import '../runner/flutter_command.dart';

class InstallCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
InstallCommand() {
InstallCommand({
required bool verboseHelp,
}) {
addBuildModeFlags(verboseHelp: verboseHelp);
requiresPubspecYaml();
usesApplicationBinaryOption();
usesDeviceTimeoutOption();
usesDeviceUserOption();
usesFlavorOption();
addBuildModeFlags(verboseHelp: false);
argParser.addFlag('uninstall-only',
help: 'Uninstall the app if already on the device. Skip install.',
);
Expand Down
10 changes: 5 additions & 5 deletions packages/flutter_tools/test/commands.shard/hermetic/install_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void main() {
});

testUsingContext('returns 0 when Android is connected and ready for an install', () async {
final InstallCommand command = InstallCommand();
final InstallCommand command = InstallCommand(verboseHelp: false);
command.applicationPackages = FakeApplicationPackageFactory(FakeAndroidApk());

final FakeAndroidDevice device = FakeAndroidDevice();
Expand All @@ -46,7 +46,7 @@ void main() {
});

testUsingContext('returns 1 when targeted device is not Android with --device-user', () async {
final InstallCommand command = InstallCommand();
final InstallCommand command = InstallCommand(verboseHelp: false);
command.applicationPackages = FakeApplicationPackageFactory(FakeAndroidApk());

final FakeIOSDevice device = FakeIOSDevice();
Expand All @@ -61,7 +61,7 @@ void main() {
});

testUsingContext('returns 0 when iOS is connected and ready for an install', () async {
final InstallCommand command = InstallCommand();
final InstallCommand command = InstallCommand(verboseHelp: false);
command.applicationPackages = FakeApplicationPackageFactory(FakeIOSApp());

final FakeIOSDevice device = FakeIOSDevice();
Expand All @@ -75,7 +75,7 @@ void main() {
});

testUsingContext('fails when prebuilt binary not found', () async {
final InstallCommand command = InstallCommand();
final InstallCommand command = InstallCommand(verboseHelp: false);
command.applicationPackages = FakeApplicationPackageFactory(FakeAndroidApk());

final FakeAndroidDevice device = FakeAndroidDevice();
Expand All @@ -90,7 +90,7 @@ void main() {
});

testUsingContext('succeeds using prebuilt binary', () async {
final InstallCommand command = InstallCommand();
final InstallCommand command = InstallCommand(verboseHelp: false);
command.applicationPackages = FakeApplicationPackageFactory(FakeAndroidApk());

final FakeAndroidDevice device = FakeAndroidDevice();
Expand Down