Skip to content

Commit 14f2a15

Browse files
committed
fix: format shard_runner config.dart
1 parent fb12346 commit 14f2a15

1 file changed

Lines changed: 42 additions & 26 deletions

File tree

shorebird/ci/shard_runner/lib/config.dart

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class PlatformConfig {
2424
final ShardDef? shard = shards[name];
2525
if (shard == null) {
2626
throw ArgumentError(
27-
'Unknown shard: $name. Available: ${shards.keys.join(', ')}');
27+
'Unknown shard: $name. Available: ${shards.keys.join(', ')}',
28+
);
2829
}
2930
return shard;
3031
}
@@ -44,17 +45,19 @@ class PlatformConfig {
4445
/// Definition of a single build shard.
4546
@immutable
4647
class ShardDef {
47-
ShardDef(
48-
{required this.steps,
49-
this.composeInput,
50-
this.artifacts = const <ArtifactDef>[]});
48+
ShardDef({
49+
required this.steps,
50+
this.composeInput,
51+
this.artifacts = const <ArtifactDef>[],
52+
});
5153

5254
factory ShardDef.fromJson(Map<String, dynamic> json) {
5355
final List<BuildStep> steps = (json['steps'] as List)
5456
.map((s) => BuildStep.fromJson(s as Map<String, dynamic>))
5557
.toList();
5658

57-
final List<ArtifactDef> artifacts = (json['artifacts'] as List?)
59+
final List<ArtifactDef> artifacts =
60+
(json['artifacts'] as List?)
5861
?.map((a) => ArtifactDef.fromJson(a as Map<String, dynamic>))
5962
.toList() ??
6063
<ArtifactDef>[];
@@ -157,9 +160,7 @@ class RustStep implements BuildStep {
157160
RustStep({required this.targets});
158161

159162
factory RustStep.fromJson(Map<String, dynamic> json) {
160-
return RustStep(
161-
targets: (json['targets'] as List).cast<String>(),
162-
);
163+
return RustStep(targets: (json['targets'] as List).cast<String>());
163164
}
164165
final List<String> targets;
165166

@@ -189,30 +190,36 @@ Future<void> _runGn(String engineSrc, List<String> args, String outDir) async {
189190
}
190191

191192
Future<void> _runNinja(
192-
String engineSrc, String outDir, List<String> targets) async {
193+
String engineSrc,
194+
String outDir,
195+
List<String> targets,
196+
) async {
193197
print('[Ninja] Building ${targets.join(' ')} in out/$outDir');
194198
await runChecked(
195199
'ninja',
196-
<String>[
197-
'-C',
198-
p.join(engineSrc, 'out', outDir),
199-
...targets,
200-
],
200+
<String>['-C', p.join(engineSrc, 'out', outDir), ...targets],
201201
workingDirectory: engineSrc,
202202
description: 'Ninja ($outDir)',
203203
);
204204
print('[Ninja] Complete');
205205
}
206206

207207
Future<void> _runRust(String engineSrc, List<String> targets) async {
208-
final String updaterPath =
209-
p.join(engineSrc, 'flutter', 'third_party', 'updater', 'library');
208+
final String updaterPath = p.join(
209+
engineSrc,
210+
'flutter',
211+
'third_party',
212+
'updater',
213+
'library',
214+
);
210215

211216
// Separate Android and non-Android targets
212-
final List<String> androidTargets =
213-
targets.where((String t) => t.contains('android')).toList();
214-
final List<String> otherTargets =
215-
targets.where((String t) => !t.contains('android')).toList();
217+
final List<String> androidTargets = targets
218+
.where((String t) => t.contains('android'))
219+
.toList();
220+
final List<String> otherTargets = targets
221+
.where((String t) => !t.contains('android'))
222+
.toList();
216223

217224
// Build all Android targets together with cargo-ndk
218225
if (androidTargets.isNotEmpty) {
@@ -227,17 +234,26 @@ Future<void> _runRust(String engineSrc, List<String> targets) async {
227234
// The "unmodified" CIPD package keeps the NDK at the standard Android
228235
// SDK path: android_tools/sdk/ndk/<version>.
229236
final Directory ndkParent = Directory(
230-
p.join(engineSrc, 'flutter', 'third_party', 'android_tools', 'sdk', 'ndk'),
237+
p.join(
238+
engineSrc,
239+
'flutter',
240+
'third_party',
241+
'android_tools',
242+
'sdk',
243+
'ndk',
244+
),
231245
);
232-
final String ndkHome = ndkParent.listSync().whereType<Directory>().first.path;
246+
final String ndkHome = ndkParent
247+
.listSync()
248+
.whereType<Directory>()
249+
.first
250+
.path;
233251

234252
await runChecked(
235253
'cargo',
236254
args,
237255
workingDirectory: updaterPath,
238-
environment: <String, String>{
239-
'ANDROID_NDK_HOME': ndkHome,
240-
},
256+
environment: <String, String>{'ANDROID_NDK_HOME': ndkHome},
241257
description: 'Cargo ndk (${androidTargets.join(', ')})',
242258
);
243259
}

0 commit comments

Comments
 (0)