Skip to content

[infra] Opt in to Dart 3.8 formatting #2319

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
merged 2 commits into from
May 21, 2025
Merged

[infra] Opt in to Dart 3.8 formatting #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21186fa
[infra] Opt in to Dart 3.8 formatting
dcharkes May 21, 2025
a2ff882
format packages outside mono repo
dcharkes May 21, 2025
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
14 changes: 7 additions & 7 deletions pkgs/code_assets/lib/src/code_assets/architecture.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ extension ArchitectureSyntaxExtension on Architecture {

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

static Architecture fromSyntax(
ArchitectureSyntax syntax,
) => switch (_fromSyntax[syntax]) {
null =>
throw FormatException('The architecture "${syntax.name}" is not known'),
final arch => arch,
};
static Architecture fromSyntax(ArchitectureSyntax syntax) =>
switch (_fromSyntax[syntax]) {
null => throw FormatException(
'The architecture "${syntax.name}" is not known',
),
final arch => arch,
};
}
7 changes: 3 additions & 4 deletions pkgs/code_assets/lib/src/code_assets/c_compiler_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ final class CCompilerConfig {

/// Configuration provided when [CodeConfig.targetOS] is [OS.windows].
WindowsCCompilerConfig get windows => switch (_windows) {
null =>
throw StateError(
'Cannot access windows if CodeConfig.targetOS is not Windows',
),
null => throw StateError(
'Cannot access windows if CodeConfig.targetOS is not Windows',
),
final c => c,
};

Expand Down
30 changes: 14 additions & 16 deletions pkgs/code_assets/lib/src/code_assets/config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ final class CodeConfig {

/// Configuration provided when [CodeConfig.targetOS] is [OS.android].
AndroidCodeConfig get android => switch (_syntax.android) {
null =>
throw StateError(
'Cannot access androidConfig if targetOS is not android.',
),
null => throw StateError(
'Cannot access androidConfig if targetOS is not android.',
),
final c => AndroidCodeConfig._(c),
};

/// Configuration provided when [CodeConfig.targetOS] is [OS.macOS].
MacOSCodeConfig get macOS => switch (_syntax.macOS) {
null =>
throw StateError('Cannot access macOSConfig if targetOS is not MacOS.'),
null => throw StateError(
'Cannot access macOSConfig if targetOS is not MacOS.',
),
final c => MacOSCodeConfig._(c),
};
}
Expand Down Expand Up @@ -214,21 +214,19 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
// TODO: Add access to assetsForBuild or assetsForLinking.
extension BuildOutputCodeAssets on BuildOutputAssets {
/// The [CodeAsset]s in this [BuildOutputAssets.encodedAssets].
List<CodeAsset> get code =>
encodedAssets
.where((asset) => asset.isCodeAsset)
.map(CodeAsset.fromEncoded)
.toList();
List<CodeAsset> get code => encodedAssets
.where((asset) => asset.isCodeAsset)
.map(CodeAsset.fromEncoded)
.toList();
}

/// The [CodeAsset]s in [LinkOutputAssets.encodedAssets].
extension LinkOutputCodeAssets on LinkOutputAssets {
/// The [CodeAsset]s in this [LinkOutputAssets.encodedAssets].
List<CodeAsset> get code =>
encodedAssets
.where((asset) => asset.isCodeAsset)
.map(CodeAsset.fromEncoded)
.toList();
List<CodeAsset> get code => encodedAssets
.where((asset) => asset.isCodeAsset)
.map(CodeAsset.fromEncoded)
.toList();
}

extension MacOSCodeConfigSyntaxExtension on MacOSCodeConfig {
Expand Down
27 changes: 12 additions & 15 deletions pkgs/code_assets/lib/src/code_assets/testing.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,18 @@ Future<void> testCodeBuildHook({
cCompiler: cCompiler,
targetArchitecture: targetArchitecture ?? Architecture.current,
targetOS: targetOS,
iOS:
targetOS == OS.iOS
? IOSCodeConfig(
targetSdk: targetIOSSdk!,
targetVersion: targetIOSVersion!,
)
: null,
macOS:
targetOS == OS.macOS
? MacOSCodeConfig(targetVersion: targetMacOSVersion!)
: null,
android:
targetOS == OS.android
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
: null,
iOS: targetOS == OS.iOS
? IOSCodeConfig(
targetSdk: targetIOSSdk!,
targetVersion: targetIOSVersion!,
)
: null,
macOS: targetOS == OS.macOS
? MacOSCodeConfig(targetVersion: targetMacOSVersion!)
: null,
android: targetOS == OS.android
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
: null,
);
await testBuildHook(
mainMethod: mainMethod,
Expand Down
2 changes: 1 addition & 1 deletion pkgs/code_assets/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ topics:
resolution: workspace

environment:
sdk: '>=3.7.0 <4.0.0'
sdk: '>=3.8.0 <4.0.0'

dependencies:
collection: ^1.19.1
Expand Down
129 changes: 62 additions & 67 deletions pkgs/code_assets/test/code_assets/config_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,34 +116,33 @@ void main() async {
}

test('BuildInput.config.code', () {
final inputBuilder =
BuildInputBuilder()
..setupShared(
packageName: packageName,
packageRoot: packageRootUri,
outputFile: outFile,
outputDirectoryShared: outputDirectoryShared,
)
..config.setupBuild(linkingEnabled: false)
..addExtension(
CodeAssetExtension(
targetOS: OS.android,
targetArchitecture: Architecture.arm64,
android: AndroidCodeConfig(targetNdkApi: 30),
linkModePreference: LinkModePreference.preferStatic,
cCompiler: CCompilerConfig(
compiler: fakeClang,
linker: fakeLd,
archiver: fakeAr,
windows: WindowsCCompilerConfig(
developerCommandPrompt: DeveloperCommandPrompt(
script: fakeVcVars,
arguments: ['arg0', 'arg1'],
),
),
final inputBuilder = BuildInputBuilder()
..setupShared(
packageName: packageName,
packageRoot: packageRootUri,
outputFile: outFile,
outputDirectoryShared: outputDirectoryShared,
)
..config.setupBuild(linkingEnabled: false)
..addExtension(
CodeAssetExtension(
targetOS: OS.android,
targetArchitecture: Architecture.arm64,
android: AndroidCodeConfig(targetNdkApi: 30),
linkModePreference: LinkModePreference.preferStatic,
cCompiler: CCompilerConfig(
compiler: fakeClang,
linker: fakeLd,
archiver: fakeAr,
windows: WindowsCCompilerConfig(
developerCommandPrompt: DeveloperCommandPrompt(
script: fakeVcVars,
arguments: ['arg0', 'arg1'],
),
),
);
),
),
);
final input = inputBuilder.build();
expect(input.json, inputJson());
expectCorrectCodeConfig(input.config.code);
Expand All @@ -162,34 +161,33 @@ void main() async {
});

test('LinkInput.{code,codeAssets}', () {
final inputBuilder =
LinkInputBuilder()
..setupShared(
packageName: packageName,
packageRoot: packageRootUri,
outputFile: outFile,
outputDirectoryShared: outputDirectoryShared,
)
..setupLink(assets: assets, recordedUsesFile: null)
..addExtension(
CodeAssetExtension(
targetOS: OS.android,
targetArchitecture: Architecture.arm64,
android: AndroidCodeConfig(targetNdkApi: 30),
linkModePreference: LinkModePreference.preferStatic,
cCompiler: CCompilerConfig(
compiler: fakeClang,
linker: fakeLd,
archiver: fakeAr,
windows: WindowsCCompilerConfig(
developerCommandPrompt: DeveloperCommandPrompt(
script: fakeVcVars,
arguments: ['arg0', 'arg1'],
),
),
final inputBuilder = LinkInputBuilder()
..setupShared(
packageName: packageName,
packageRoot: packageRootUri,
outputFile: outFile,
outputDirectoryShared: outputDirectoryShared,
)
..setupLink(assets: assets, recordedUsesFile: null)
..addExtension(
CodeAssetExtension(
targetOS: OS.android,
targetArchitecture: Architecture.arm64,
android: AndroidCodeConfig(targetNdkApi: 30),
linkModePreference: LinkModePreference.preferStatic,
cCompiler: CCompilerConfig(
compiler: fakeClang,
linker: fakeLd,
archiver: fakeAr,
windows: WindowsCCompilerConfig(
developerCommandPrompt: DeveloperCommandPrompt(
script: fakeVcVars,
arguments: ['arg0', 'arg1'],
),
),
);
),
),
);
final input = inputBuilder.build();
expect(input.json, inputJson(hookType: 'link'));
expectCorrectCodeConfig(input.config.code);
Expand All @@ -210,11 +208,10 @@ void main() async {
test('BuildInput.config.code: invalid architecture', () {
final input = inputJson();
traverseJson<Map<String, Object?>>(input, [
'config',
'extensions',
'code_assets',
])['target_architecture'] =
'invalid_architecture';
'config',
'extensions',
'code_assets',
])['target_architecture'] = 'invalid_architecture';
expect(
() => BuildInput(input).config.code.targetArchitecture,
throwsFormatException,
Expand All @@ -224,22 +221,20 @@ void main() async {
test('LinkInput.config.code: invalid os', () {
final input = inputJson(hookType: 'link');
traverseJson<Map<String, Object?>>(input, [
'config',
'extensions',
'code_assets',
])['target_os'] =
'invalid_os';
'config',
'extensions',
'code_assets',
])['target_os'] = 'invalid_os';
expect(() => LinkInput(input).config.code.targetOS, throwsFormatException);
});

test('LinkInput.config.code.target_os invalid type', () {
final input = inputJson(hookType: 'link');
traverseJson<Map<String, Object?>>(input, [
'config',
'extensions',
'code_assets',
])['target_os'] =
123;
'config',
'extensions',
'code_assets',
])['target_os'] = 123;
expect(
() => LinkInput(input).config.code.targetOS,
throwsA(
Expand Down
Loading
Loading