Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Switch script/tools over to the new analysis options #3777

Merged
merged 7 commits into from
Apr 6, 2021
Merged

Switch script/tools over to the new analysis options #3777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2409b37
Remove override
stuartmorgan Apr 1, 2021
243cc2d
Fix errors
stuartmorgan Apr 1, 2021
b80b3ba
<Null> -> <void>
stuartmorgan Apr 1, 2021
d136ba5
dart fix
stuartmorgan Apr 1, 2021
ef94c43
Fix everything but missing API comments
stuartmorgan Apr 1, 2021
5a51d5e
Add comments
stuartmorgan Apr 1, 2021
1b15e77
Merge branch 'master' into tool-analysis-alignment
stuartmorgan Apr 6, 2021
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
1 change: 0 additions & 1 deletion script/tool/analysis_options.yaml
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions script/tool/lib/src/analyze_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import 'package:path/path.dart' as p;

import 'common.dart';

/// A command to run Dart analysis on packages.
class AnalyzeCommand extends PluginCommand {
/// Creates a analysis command instance.
AnalyzeCommand(
Directory packagesDir,
FileSystem fileSystem, {
Expand All @@ -31,9 +33,7 @@ class AnalyzeCommand extends PluginCommand {
'This command requires "pub" and "flutter" to be in your path.';

@override
Future<Null> run() async {
checkSharding();

Future<void> run() async {
print('Verifying analysis settings...');
final List<FileSystemEntity> files = packagesDir.listSync(recursive: true);
for (final FileSystemEntity file in files) {
Expand All @@ -42,8 +42,8 @@ class AnalyzeCommand extends PluginCommand {
continue;
}

final bool allowed = argResults[_customAnalysisFlag].any(
(String directory) =>
final bool allowed = (argResults[_customAnalysisFlag] as List<String>)
.any((String directory) =>
directory != null &&
directory.isNotEmpty &&
p.isWithin(p.join(packagesDir.path, directory), file.path));
Expand All @@ -62,7 +62,7 @@ class AnalyzeCommand extends PluginCommand {
'pub', <String>['global', 'activate', 'tuneup'],
workingDir: packagesDir, exitOnError: true);

await for (Directory package in getPackages()) {
await for (final Directory package in getPackages()) {
if (isFlutterPackage(package, fileSystem)) {
await processRunner.runAndStream('flutter', <String>['packages', 'get'],
workingDir: package, exitOnError: true);
Expand All @@ -73,7 +73,7 @@ class AnalyzeCommand extends PluginCommand {
}

final List<String> failingPackages = <String>[];
await for (Directory package in getPlugins()) {
await for (final Directory package in getPlugins()) {
final int exitCode = await processRunner.runAndStream(
'pub', <String>['global', 'run', 'tuneup', 'check'],
workingDir: package);
Expand All @@ -85,9 +85,9 @@ class AnalyzeCommand extends PluginCommand {
print('\n\n');
if (failingPackages.isNotEmpty) {
print('The following packages have analyzer errors (see above):');
failingPackages.forEach((String package) {
for (final String package in failingPackages) {
print(' * $package');
});
}
throw ToolExit(1);
}

Expand Down
59 changes: 34 additions & 25 deletions script/tool/lib/src/build_examples_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import 'package:platform/platform.dart';

import 'common.dart';

/// A command to build the example applications for packages.
class BuildExamplesCommand extends PluginCommand {
/// Creates an instance of the build command.
BuildExamplesCommand(
Directory packagesDir,
FileSystem fileSystem, {
Expand Down Expand Up @@ -39,33 +41,40 @@ class BuildExamplesCommand extends PluginCommand {
'This command requires "flutter" to be in your path.';

@override
Future<Null> run() async {
if (!argResults[kIpa] &&
!argResults[kApk] &&
!argResults[kLinux] &&
!argResults[kMacos] &&
!argResults[kWeb] &&
!argResults[kWindows]) {
print('None of --linux, --macos, --web, --windows, --apk, or --ipa were '
'specified, so not building anything.');
Future<void> run() async {
final List<String> platformSwitches = <String>[
kApk,
kIpa,
kLinux,
kMacos,
kWeb,
kWindows,
];
final Map<String, bool> platforms = <String, bool>{
for (final String platform in platformSwitches)
platform: argResults[platform] as bool
};
if (!platforms.values.any((bool enabled) => enabled)) {
print(
'None of ${platformSwitches.map((String platform) => '--$platform').join(', ')} '
'were specified, so not building anything.');
return;
}
final String flutterCommand =
LocalPlatform().isWindows ? 'flutter.bat' : 'flutter';
const LocalPlatform().isWindows ? 'flutter.bat' : 'flutter';

final String enableExperiment = argResults[kEnableExperiment];
final String enableExperiment = argResults[kEnableExperiment] as String;

checkSharding();
final List<String> failingPackages = <String>[];
await for (Directory plugin in getPlugins()) {
for (Directory example in getExamplesForPlugin(plugin)) {
await for (final Directory plugin in getPlugins()) {
for (final Directory example in getExamplesForPlugin(plugin)) {
final String packageName =
p.relative(example.path, from: packagesDir.path);

if (argResults[kLinux]) {
if (platforms[kLinux]) {
print('\nBUILDING Linux for $packageName');
if (isLinuxPlugin(plugin, fileSystem)) {
int buildExitCode = await processRunner.runAndStream(
final int buildExitCode = await processRunner.runAndStream(
flutterCommand,
<String>[
'build',
Expand All @@ -82,10 +91,10 @@ class BuildExamplesCommand extends PluginCommand {
}
}

if (argResults[kMacos]) {
if (platforms[kMacos]) {
print('\nBUILDING macOS for $packageName');
if (isMacOsPlugin(plugin, fileSystem)) {
int exitCode = await processRunner.runAndStream(
final int exitCode = await processRunner.runAndStream(
flutterCommand,
<String>[
'build',
Expand All @@ -102,10 +111,10 @@ class BuildExamplesCommand extends PluginCommand {
}
}

if (argResults[kWeb]) {
if (platforms[kWeb]) {
print('\nBUILDING web for $packageName');
if (isWebPlugin(plugin, fileSystem)) {
int buildExitCode = await processRunner.runAndStream(
final int buildExitCode = await processRunner.runAndStream(
flutterCommand,
<String>[
'build',
Expand All @@ -122,10 +131,10 @@ class BuildExamplesCommand extends PluginCommand {
}
}

if (argResults[kWindows]) {
if (platforms[kWindows]) {
print('\nBUILDING Windows for $packageName');
if (isWindowsPlugin(plugin, fileSystem)) {
int buildExitCode = await processRunner.runAndStream(
final int buildExitCode = await processRunner.runAndStream(
flutterCommand,
<String>[
'build',
Expand All @@ -142,7 +151,7 @@ class BuildExamplesCommand extends PluginCommand {
}
}

if (argResults[kIpa]) {
if (platforms[kIpa]) {
print('\nBUILDING IPA for $packageName');
if (isIosPlugin(plugin, fileSystem)) {
final int exitCode = await processRunner.runAndStream(
Expand All @@ -163,7 +172,7 @@ class BuildExamplesCommand extends PluginCommand {
}
}

if (argResults[kApk]) {
if (platforms[kApk]) {
print('\nBUILDING APK for $packageName');
if (isAndroidPlugin(plugin, fileSystem)) {
final int exitCode = await processRunner.runAndStream(
Expand All @@ -188,7 +197,7 @@ class BuildExamplesCommand extends PluginCommand {

if (failingPackages.isNotEmpty) {
print('The following build are failing (see above for details):');
for (String package in failingPackages) {
for (final String package in failingPackages) {
print(' * $package');
}
throw ToolExit(1);
Expand Down
Loading