Skip to content

[native_assets_cli] Cleanup JSON: old code config #2221

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 1 commit into from
Apr 22, 2025
Merged

[native_assets_cli] Cleanup JSON: old code config #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 2 additions & 13 deletions pkgs/code_assets/doc/schema/hook/shared_definitions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
{
"$schema": "https://json-schema.org/draft-07/schema#",
"title": "package:code_assets party:sdk shared definitions",
"title": "package:code_assets party:hook shared definitions",
"definitions": {
"BuildInput": {},
"BuildOutput": {},
"HookInput": {
"properties": {
"config": {
"properties": {
"code": {
"$comment": "Future SDKs will no longer provide 'code', 'extensions.code_config' instead.",
"deprecated": true
}
}
}
}
},
"HookInput": {},
"HookOutput": {},
"LinkInput": {},
"LinkOutput": {}
Expand Down
12 changes: 1 addition & 11 deletions pkgs/code_assets/doc/schema/sdk/shared_definitions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,7 @@
"definitions": {
"BuildInput": {},
"BuildOutput": {},
"HookInput": {
"properties": {
"config": {
"properties": {
"code": {
"$comment": "Old hooks still read 'code' so provide both 'code' and 'extensions.code_config'."
}
}
}
}
},
"HookInput": {},
"HookOutput": {},
"LinkInput": {},
"LinkOutput": {}
Expand Down
3 changes: 0 additions & 3 deletions pkgs/code_assets/doc/schema/shared/shared_definitions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,6 @@
"Config": {
"type": "object",
"properties": {
"code": {
"$ref": "#/definitions/CodeConfig"
},
"extensions": {
"$ref": "#/definitions/ConfigExtensions"
}
Expand Down
13 changes: 0 additions & 13 deletions pkgs/code_assets/test/data/build_input_android.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@
"build_asset_types": [
"code_assets/code"
],
"code": {
"android": {
"target_ndk_api": 21
},
"c_compiler": {
"ar": "/Users/dacoharkes/Library/Android/sdk/ndk/28.0.12674087/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar",
"cc": "/Users/dacoharkes/Library/Android/sdk/ndk/28.0.12674087/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang",
"ld": "/Users/dacoharkes/Library/Android/sdk/ndk/28.0.12674087/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld"
},
"link_mode_preference": "dynamic",
"target_architecture": "arm",
"target_os": "android"
},
"extensions": {
"code_assets": {
"android": {
Expand Down
14 changes: 0 additions & 14 deletions pkgs/code_assets/test/data/build_input_ios.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,6 @@
"build_asset_types": [
"code_assets/code"
],
"code": {
"c_compiler": {
"ar": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar",
"cc": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
"ld": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
},
"ios": {
"target_sdk": "iphonesimulator",
"target_version": 12
},
"link_mode_preference": "dynamic",
"target_architecture": "arm64",
"target_os": "ios"
},
"extensions": {
"code_assets": {
"c_compiler": {
Expand Down
10 changes: 0 additions & 10 deletions pkgs/code_assets/test/data/build_input_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@
"build_asset_types": [
"code_assets/code"
],
"code": {
"c_compiler": {
"ar": "/usr/lib/llvm-16/bin/llvm-ar",
"cc": "/usr/lib/llvm-16/bin/clang",
"ld": "/usr/lib/llvm-16/bin/ld.lld"
},
"link_mode_preference": "dynamic",
"target_architecture": "x64",
"target_os": "linux"
},
"extensions": {
"code_assets": {
"c_compiler": {
Expand Down
13 changes: 0 additions & 13 deletions pkgs/code_assets/test/data/build_input_macos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@
"build_asset_types": [
"code_assets/code"
],
"code": {
"c_compiler": {
"ar": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar",
"cc": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
"ld": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
},
"link_mode_preference": "dynamic",
"macos": {
"target_version": 13
},
"target_architecture": "arm64",
"target_os": "macos"
},
"extensions": {
"code_assets": {
"c_compiler": {
Expand Down
18 changes: 0 additions & 18 deletions pkgs/code_assets/test/data/build_input_windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,6 @@
"build_asset_types": [
"code_assets/code"
],
"code": {
"c_compiler": {
"ar": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.35.32215\\bin\\Hostx64\\x64\\lib.exe",
"cc": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.35.32215\\bin\\Hostx64\\x64\\cl.exe",
"env_script": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat",
"env_script_arguments": [],
"ld": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.35.32215\\bin\\Hostx64\\x64\\link.exe",
"windows": {
"developer_command_prompt": {
"arguments": [],
"script": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
}
}
},
"link_mode_preference": "dynamic",
"target_architecture": "x64",
"target_os": "windows"
},
"extensions": {
"code_assets": {
"c_compiler": {
Expand Down
13 changes: 0 additions & 13 deletions pkgs/code_assets/test/data/link_input_macos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,6 @@
"build_asset_types": [
"code_assets/code"
],
"code": {
"c_compiler": {
"ar": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar",
"cc": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang",
"ld": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
},
"link_mode_preference": "dynamic",
"macos": {
"target_version": 13
},
"target_architecture": "arm64",
"target_os": "macos"
},
"extensions": {
"code_assets": {
"c_compiler": {
Expand Down
159 changes: 68 additions & 91 deletions pkgs/code_assets/test/schema/schema_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ void main() {

Uri packageUri = findPackageRoot('code_assets');

const _codeConfigPath = ['config', 'extensions', 'code_assets'];

FieldsFunction _codeFields(AllTestData allTestData) {
final dataUri = packageUri.resolve('test/data/build_output_macos.json');
final assets =
Expand Down Expand Up @@ -96,27 +98,23 @@ FieldsFunction _codeFields(AllTestData allTestData) {
];

return <(List<Object>, void Function(ValidationResults result))>[
for (final codeConfigPath in [
['config', 'code'],
['config', 'extensions', 'code_assets'],
])
if (inputOrOutput == InputOrOutput.input) ...[
([...codeConfigPath, 'c_compiler'], expectOptionalFieldMissing),
([...codeConfigPath, 'c_compiler', 'ar'], expectRequiredFieldMissing),
([...codeConfigPath, 'c_compiler', 'cc'], expectRequiredFieldMissing),
([...codeConfigPath, 'c_compiler', 'ld'], expectRequiredFieldMissing),
([...codeConfigPath, 'macos'], expectRequiredFieldMissing),
(
[...codeConfigPath, 'macos', 'target_version'],
expectRequiredFieldMissing,
),
if (hook == Hook.link) ...[
for (final (field, expect) in codeAssetFields) ...[
(['assets', 0, 'encoding', ...field], expect),
(['assets', 1, 'encoding', ...field], expect),
],
if (inputOrOutput == InputOrOutput.input) ...[
([..._codeConfigPath, 'c_compiler'], expectOptionalFieldMissing),
([..._codeConfigPath, 'c_compiler', 'ar'], expectRequiredFieldMissing),
([..._codeConfigPath, 'c_compiler', 'cc'], expectRequiredFieldMissing),
([..._codeConfigPath, 'c_compiler', 'ld'], expectRequiredFieldMissing),
([..._codeConfigPath, 'macos'], expectRequiredFieldMissing),
(
[..._codeConfigPath, 'macos', 'target_version'],
expectRequiredFieldMissing,
),
if (hook == Hook.link) ...[
for (final (field, expect) in codeAssetFields) ...[
(['assets', 0, 'encoding', ...field], expect),
(['assets', 1, 'encoding', ...field], expect),
],
],
],
if (inputOrOutput == InputOrOutput.output) ...[
for (final (field, expect) in codeAssetFields)
(['assets', 0, 'encoding', ...field], expect),
Expand Down Expand Up @@ -154,74 +152,57 @@ _codeFieldsWindows({
required Hook hook,
required Party party,
}) => <(List<Object>, void Function(ValidationResults result))>[
if (inputOrOutput == InputOrOutput.input && hook == Hook.build)
for (final codeConfigPath in [
['config', 'code'],
['config', 'extensions', 'code_assets'],
]) ...[
(
[...codeConfigPath, 'c_compiler', 'env_script'],
expectOptionalFieldMissing,
),
(
[...codeConfigPath, 'c_compiler', 'env_script_arguments'],
expectOptionalFieldMissing,
),
(
[...codeConfigPath, 'c_compiler', 'windows'],
expectRequiredFieldMissing,
),
(
[
...codeConfigPath,
'c_compiler',
'windows',
'developer_command_prompt',
],
expectOptionalFieldMissing,
),
(
[
'config',
'code',
'c_compiler',
'windows',
'developer_command_prompt',
'script',
],
expectRequiredFieldMissing,
),
(
[
'config',
'code',
'c_compiler',
'windows',
'developer_command_prompt',
'arguments',
],
expectRequiredFieldMissing,
),
],
if (inputOrOutput == InputOrOutput.input && hook == Hook.build) ...[
(
[..._codeConfigPath, 'c_compiler', 'env_script'],
expectOptionalFieldMissing,
),
(
[..._codeConfigPath, 'c_compiler', 'env_script_arguments'],
expectOptionalFieldMissing,
),
([..._codeConfigPath, 'c_compiler', 'windows'], expectRequiredFieldMissing),
(
[..._codeConfigPath, 'c_compiler', 'windows', 'developer_command_prompt'],
expectOptionalFieldMissing,
),
(
[
'config',
'extensions',
'code_assets',
'c_compiler',
'windows',
'developer_command_prompt',
'script',
],
expectRequiredFieldMissing,
),
(
[
'config',
'extensions',
'code_assets',
'c_compiler',
'windows',
'developer_command_prompt',
'arguments',
],
expectRequiredFieldMissing,
),
],
];

List<(List<Object>, void Function(ValidationResults result))> _codeFieldsIOS({
required InputOrOutput inputOrOutput,
required Hook hook,
required Party party,
}) => <(List<Object>, void Function(ValidationResults result))>[
if (inputOrOutput == InputOrOutput.input && hook == Hook.build)
for (final codeConfigPath in [
['config', 'code'],
['config', 'extensions', 'code_assets'],
]) ...[
([...codeConfigPath, 'ios'], expectRequiredFieldMissing),
([...codeConfigPath, 'ios', 'target_sdk'], expectRequiredFieldMissing),
(
[...codeConfigPath, 'ios', 'target_version'],
expectRequiredFieldMissing,
),
],
if (inputOrOutput == InputOrOutput.input && hook == Hook.build) ...[
([..._codeConfigPath, 'ios'], expectRequiredFieldMissing),
([..._codeConfigPath, 'ios', 'target_sdk'], expectRequiredFieldMissing),
([..._codeConfigPath, 'ios', 'target_version'], expectRequiredFieldMissing),
],
];

List<(List<Object>, void Function(ValidationResults result))>
Expand All @@ -230,15 +211,11 @@ _codeFieldsAndroid({
required Hook hook,
required Party party,
}) => <(List<Object>, void Function(ValidationResults result))>[
if (inputOrOutput == InputOrOutput.input && hook == Hook.build)
for (final codeConfigPath in [
['config', 'code'],
['config', 'extensions', 'code_assets'],
]) ...[
([...codeConfigPath, 'android'], expectRequiredFieldMissing),
(
[...codeConfigPath, 'android', 'target_ndk_api'],
expectRequiredFieldMissing,
),
],
if (inputOrOutput == InputOrOutput.input && hook == Hook.build) ...[
([..._codeConfigPath, 'android'], expectRequiredFieldMissing),
(
[..._codeConfigPath, 'android', 'target_ndk_api'],
expectRequiredFieldMissing,
),
],
];
8 changes: 4 additions & 4 deletions pkgs/native_assets_cli/lib/src/code_assets/config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ class CodeConfig {
final syntax.CodeConfig _syntax;

CodeConfig._fromJson(Map<String, Object?> json, List<Object> path)
: _syntax =
syntax.Config.fromJson(json, path: path).extensions?.codeAssets ??
syntax.Config.fromJson(json, path: path).code!;
: _syntax = syntax.Config.fromJson(
json,
path: path,
).extensions!.codeAssets!;

/// The architecture the code code asset should be built for.
///
Expand Down Expand Up @@ -207,7 +208,6 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
baseHookConfig.extensions ??= hook_syntax.JsonObject.fromJson({});
final hookConfig = syntax.Config.fromJson(baseHookConfig.json);
hookConfig.extensions!.codeAssets = codeConfig;
hookConfig.code = codeConfig; // old location
}
}

Expand Down
Loading
Loading