Skip to content

Commit f2cae97

Browse files
dcharkesdcharkes
authored
[infra] Opt in to Dart 3.8 formatting (#2319)
Dart 3.8 is out. Let's bump the formatting. We need to bump the SDK constraints to 3.9.0 dev for: * #2318
1 parent 0dd69bd commit f2cae97

File tree

156 files changed

+1673
-1782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+1673
-1782
lines changed

‎pkgs/code_assets/lib/src/code_assets/architecture.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ extension ArchitectureSyntaxExtension on Architecture {
100100

101101
ArchitectureSyntax toSyntax() => _toSyntax[this]!;
102102

103-
static Architecture fromSyntax(
104-
ArchitectureSyntax syntax,
105-
) => switch (_fromSyntax[syntax]) {
106-
null =>
107-
throw FormatException('The architecture "${syntax.name}" is not known'),
108-
final arch => arch,
109-
};
103+
static Architecture fromSyntax(ArchitectureSyntax syntax) =>
104+
switch (_fromSyntax[syntax]) {
105+
null => throw FormatException(
106+
'The architecture "${syntax.name}" is not known',
107+
),
108+
final arch => arch,
109+
};
110110
}

‎pkgs/code_assets/lib/src/code_assets/c_compiler_config.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ final class CCompilerConfig {
2323

2424
/// Configuration provided when [CodeConfig.targetOS] is [OS.windows].
2525
WindowsCCompilerConfig get windows => switch (_windows) {
26-
null =>
27-
throw StateError(
28-
'Cannot access windows if CodeConfig.targetOS is not Windows',
29-
),
26+
null => throw StateError(
27+
'Cannot access windows if CodeConfig.targetOS is not Windows',
28+
),
3029
final c => c,
3130
};
3231

‎pkgs/code_assets/lib/src/code_assets/config.dart

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ final class CodeConfig {
7373

7474
/// Configuration provided when [CodeConfig.targetOS] is [OS.android].
7575
AndroidCodeConfig get android => switch (_syntax.android) {
76-
null =>
77-
throw StateError(
78-
'Cannot access androidConfig if targetOS is not android.',
79-
),
76+
null => throw StateError(
77+
'Cannot access androidConfig if targetOS is not android.',
78+
),
8079
final c => AndroidCodeConfig._(c),
8180
};
8281

8382
/// Configuration provided when [CodeConfig.targetOS] is [OS.macOS].
8483
MacOSCodeConfig get macOS => switch (_syntax.macOS) {
85-
null =>
86-
throw StateError('Cannot access macOSConfig if targetOS is not MacOS.'),
84+
null => throw StateError(
85+
'Cannot access macOSConfig if targetOS is not MacOS.',
86+
),
8787
final c => MacOSCodeConfig._(c),
8888
};
8989
}
@@ -214,21 +214,19 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
214214
// TODO: Add access to assetsForBuild or assetsForLinking.
215215
extension BuildOutputCodeAssets on BuildOutputAssets {
216216
/// The [CodeAsset]s in this [BuildOutputAssets.encodedAssets].
217-
List<CodeAsset> get code =>
218-
encodedAssets
219-
.where((asset) => asset.isCodeAsset)
220-
.map(CodeAsset.fromEncoded)
221-
.toList();
217+
List<CodeAsset> get code => encodedAssets
218+
.where((asset) => asset.isCodeAsset)
219+
.map(CodeAsset.fromEncoded)
220+
.toList();
222221
}
223222

224223
/// The [CodeAsset]s in [LinkOutputAssets.encodedAssets].
225224
extension LinkOutputCodeAssets on LinkOutputAssets {
226225
/// The [CodeAsset]s in this [LinkOutputAssets.encodedAssets].
227-
List<CodeAsset> get code =>
228-
encodedAssets
229-
.where((asset) => asset.isCodeAsset)
230-
.map(CodeAsset.fromEncoded)
231-
.toList();
226+
List<CodeAsset> get code => encodedAssets
227+
.where((asset) => asset.isCodeAsset)
228+
.map(CodeAsset.fromEncoded)
229+
.toList();
232230
}
233231

234232
extension MacOSCodeConfigSyntaxExtension on MacOSCodeConfig {

‎pkgs/code_assets/lib/src/code_assets/testing.dart

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,18 @@ Future<void> testCodeBuildHook({
5555
cCompiler: cCompiler,
5656
targetArchitecture: targetArchitecture ?? Architecture.current,
5757
targetOS: targetOS,
58-
iOS:
59-
targetOS == OS.iOS
60-
? IOSCodeConfig(
61-
targetSdk: targetIOSSdk!,
62-
targetVersion: targetIOSVersion!,
63-
)
64-
: null,
65-
macOS:
66-
targetOS == OS.macOS
67-
? MacOSCodeConfig(targetVersion: targetMacOSVersion!)
68-
: null,
69-
android:
70-
targetOS == OS.android
71-
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
72-
: null,
58+
iOS: targetOS == OS.iOS
59+
? IOSCodeConfig(
60+
targetSdk: targetIOSSdk!,
61+
targetVersion: targetIOSVersion!,
62+
)
63+
: null,
64+
macOS: targetOS == OS.macOS
65+
? MacOSCodeConfig(targetVersion: targetMacOSVersion!)
66+
: null,
67+
android: targetOS == OS.android
68+
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
69+
: null,
7370
);
7471
await testBuildHook(
7572
mainMethod: mainMethod,

‎pkgs/code_assets/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ topics:
1717
resolution: workspace
1818

1919
environment:
20-
sdk: '>=3.7.0 <4.0.0'
20+
sdk: '>=3.8.0 <4.0.0'
2121

2222
dependencies:
2323
collection: ^1.19.1

‎pkgs/code_assets/test/code_assets/config_test.dart

Lines changed: 62 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -116,34 +116,33 @@ void main() async {
116116
}
117117

118118
test('BuildInput.config.code', () {
119-
final inputBuilder =
120-
BuildInputBuilder()
121-
..setupShared(
122-
packageName: packageName,
123-
packageRoot: packageRootUri,
124-
outputFile: outFile,
125-
outputDirectoryShared: outputDirectoryShared,
126-
)
127-
..config.setupBuild(linkingEnabled: false)
128-
..addExtension(
129-
CodeAssetExtension(
130-
targetOS: OS.android,
131-
targetArchitecture: Architecture.arm64,
132-
android: AndroidCodeConfig(targetNdkApi: 30),
133-
linkModePreference: LinkModePreference.preferStatic,
134-
cCompiler: CCompilerConfig(
135-
compiler: fakeClang,
136-
linker: fakeLd,
137-
archiver: fakeAr,
138-
windows: WindowsCCompilerConfig(
139-
developerCommandPrompt: DeveloperCommandPrompt(
140-
script: fakeVcVars,
141-
arguments: ['arg0', 'arg1'],
142-
),
143-
),
119+
final inputBuilder = BuildInputBuilder()
120+
..setupShared(
121+
packageName: packageName,
122+
packageRoot: packageRootUri,
123+
outputFile: outFile,
124+
outputDirectoryShared: outputDirectoryShared,
125+
)
126+
..config.setupBuild(linkingEnabled: false)
127+
..addExtension(
128+
CodeAssetExtension(
129+
targetOS: OS.android,
130+
targetArchitecture: Architecture.arm64,
131+
android: AndroidCodeConfig(targetNdkApi: 30),
132+
linkModePreference: LinkModePreference.preferStatic,
133+
cCompiler: CCompilerConfig(
134+
compiler: fakeClang,
135+
linker: fakeLd,
136+
archiver: fakeAr,
137+
windows: WindowsCCompilerConfig(
138+
developerCommandPrompt: DeveloperCommandPrompt(
139+
script: fakeVcVars,
140+
arguments: ['arg0', 'arg1'],
144141
),
145142
),
146-
);
143+
),
144+
),
145+
);
147146
final input = inputBuilder.build();
148147
expect(input.json, inputJson());
149148
expectCorrectCodeConfig(input.config.code);
@@ -162,34 +161,33 @@ void main() async {
162161
});
163162

164163
test('LinkInput.{code,codeAssets}', () {
165-
final inputBuilder =
166-
LinkInputBuilder()
167-
..setupShared(
168-
packageName: packageName,
169-
packageRoot: packageRootUri,
170-
outputFile: outFile,
171-
outputDirectoryShared: outputDirectoryShared,
172-
)
173-
..setupLink(assets: assets, recordedUsesFile: null)
174-
..addExtension(
175-
CodeAssetExtension(
176-
targetOS: OS.android,
177-
targetArchitecture: Architecture.arm64,
178-
android: AndroidCodeConfig(targetNdkApi: 30),
179-
linkModePreference: LinkModePreference.preferStatic,
180-
cCompiler: CCompilerConfig(
181-
compiler: fakeClang,
182-
linker: fakeLd,
183-
archiver: fakeAr,
184-
windows: WindowsCCompilerConfig(
185-
developerCommandPrompt: DeveloperCommandPrompt(
186-
script: fakeVcVars,
187-
arguments: ['arg0', 'arg1'],
188-
),
189-
),
164+
final inputBuilder = LinkInputBuilder()
165+
..setupShared(
166+
packageName: packageName,
167+
packageRoot: packageRootUri,
168+
outputFile: outFile,
169+
outputDirectoryShared: outputDirectoryShared,
170+
)
171+
..setupLink(assets: assets, recordedUsesFile: null)
172+
..addExtension(
173+
CodeAssetExtension(
174+
targetOS: OS.android,
175+
targetArchitecture: Architecture.arm64,
176+
android: AndroidCodeConfig(targetNdkApi: 30),
177+
linkModePreference: LinkModePreference.preferStatic,
178+
cCompiler: CCompilerConfig(
179+
compiler: fakeClang,
180+
linker: fakeLd,
181+
archiver: fakeAr,
182+
windows: WindowsCCompilerConfig(
183+
developerCommandPrompt: DeveloperCommandPrompt(
184+
script: fakeVcVars,
185+
arguments: ['arg0', 'arg1'],
190186
),
191187
),
192-
);
188+
),
189+
),
190+
);
193191
final input = inputBuilder.build();
194192
expect(input.json, inputJson(hookType: 'link'));
195193
expectCorrectCodeConfig(input.config.code);
@@ -210,11 +208,10 @@ void main() async {
210208
test('BuildInput.config.code: invalid architecture', () {
211209
final input = inputJson();
212210
traverseJson<Map<String, Object?>>(input, [
213-
'config',
214-
'extensions',
215-
'code_assets',
216-
])['target_architecture'] =
217-
'invalid_architecture';
211+
'config',
212+
'extensions',
213+
'code_assets',
214+
])['target_architecture'] = 'invalid_architecture';
218215
expect(
219216
() => BuildInput(input).config.code.targetArchitecture,
220217
throwsFormatException,
@@ -224,22 +221,20 @@ void main() async {
224221
test('LinkInput.config.code: invalid os', () {
225222
final input = inputJson(hookType: 'link');
226223
traverseJson<Map<String, Object?>>(input, [
227-
'config',
228-
'extensions',
229-
'code_assets',
230-
])['target_os'] =
231-
'invalid_os';
224+
'config',
225+
'extensions',
226+
'code_assets',
227+
])['target_os'] = 'invalid_os';
232228
expect(() => LinkInput(input).config.code.targetOS, throwsFormatException);
233229
});
234230

235231
test('LinkInput.config.code.target_os invalid type', () {
236232
final input = inputJson(hookType: 'link');
237233
traverseJson<Map<String, Object?>>(input, [
238-
'config',
239-
'extensions',
240-
'code_assets',
241-
])['target_os'] =
242-
123;
234+
'config',
235+
'extensions',
236+
'code_assets',
237+
])['target_os'] = 123;
243238
expect(
244239
() => LinkInput(input).config.code.targetOS,
245240
throwsA(

0 commit comments

Comments
 (0)