Skip to content

[native_assets_cli] Nest config extensions #2133

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
Mar 26, 2025
Merged

[native_assets_cli] Nest config extensions #2133

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
18 changes: 18 additions & 0 deletions pkgs/code_assets/doc/schema/hook/shared_definitions.generated.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/BuildInput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/BuildInput"
}
]
},
Expand All @@ -26,6 +29,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/BuildOutput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/BuildOutput"
}
]
},
Expand All @@ -36,6 +42,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/HookInput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/HookInput"
}
]
},
Expand All @@ -46,6 +55,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/HookOutput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/HookOutput"
}
]
},
Expand All @@ -59,6 +71,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/LinkInput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/LinkInput"
}
]
},
Expand All @@ -72,6 +87,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/LinkOutput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/LinkOutput"
}
]
}
Expand Down
23 changes: 23 additions & 0 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
@@ -0,0 +1,23 @@
{
"$schema": "https://json-schema.org/draft-07/schema#",
"title": "package:code_assets party:sdk shared definitions",
"definitions": {
"BuildInput": {},
"BuildOutput": {},
"HookInput": {
"properties": {
"config": {
"properties": {
"code": {
"$comment": "Future SDKs will no longer provide 'code', 'extensions.code_config' instead.",
"deprecated": true
}
}
}
}
},
"HookOutput": {},
"LinkInput": {},
"LinkOutput": {}
}
}
18 changes: 18 additions & 0 deletions pkgs/code_assets/doc/schema/sdk/shared_definitions.generated.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/BuildInput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/BuildInput"
}
]
},
Expand All @@ -26,6 +29,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/BuildOutput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/BuildOutput"
}
]
},
Expand All @@ -36,6 +42,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/HookInput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/HookInput"
}
]
},
Expand All @@ -46,6 +55,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/HookOutput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/HookOutput"
}
]
},
Expand All @@ -59,6 +71,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/LinkInput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/LinkInput"
}
]
},
Expand All @@ -72,6 +87,9 @@
},
{
"$ref": "../shared/shared_definitions.generated.schema.json#/definitions/LinkOutput"
},
{
"$ref": "shared_definitions.schema.json#/definitions/LinkOutput"
}
]
}
Expand Down
22 changes: 22 additions & 0 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
@@ -0,0 +1,22 @@
{
"$schema": "https://json-schema.org/draft-07/schema#",
"title": "package:code_assets party:sdk shared definitions",
"definitions": {
"BuildInput": {},
"BuildOutput": {},
"HookInput": {
"properties": {
"config": {
"properties": {
"code": {
"$comment": "Old hooks still read 'code' so provide both 'code' and 'extensions.code_config'."
}
}
}
}
},
"HookOutput": {},
"LinkInput": {},
"LinkOutput": {}
}
}
11 changes: 11 additions & 0 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 @@ -255,6 +255,17 @@
"properties": {
"code": {
"$ref": "#/definitions/CodeConfig"
},
"extensions": {
"$ref": "#/definitions/ConfigExtensions"
}
}
},
"ConfigExtensions": {
"type": "object",
"properties": {
"code_assets": {
"$ref": "#/definitions/CodeConfig"
}
}
},
Expand Down
15 changes: 15 additions & 0 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 @@ -17,6 +17,21 @@
"target_architecture": "arm",
"target_os": "android"
},
"extensions": {
"code_assets": {
"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"
}
},
"linking_enabled": true
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/out/",
Expand Down
16 changes: 16 additions & 0 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 @@ -18,6 +18,22 @@
"target_architecture": "arm64",
"target_os": "ios"
},
"extensions": {
"code_assets": {
"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"
}
},
"linking_enabled": false
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/51d66b45a7c440edc44bf124509a5dda/out/",
Expand Down
12 changes: 12 additions & 0 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 @@ -14,6 +14,18 @@
"target_architecture": "x64",
"target_os": "linux"
},
"extensions": {
"code_assets": {
"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"
}
},
"linking_enabled": false
},
"out_dir": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/out/",
Expand Down
15 changes: 15 additions & 0 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 @@ -17,6 +17,21 @@
"target_architecture": "arm64",
"target_os": "macos"
},
"extensions": {
"code_assets": {
"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"
}
},
"linking_enabled": false
},
"dependency_metadata": {
Expand Down
20 changes: 20 additions & 0 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 @@ -22,6 +22,26 @@
"target_architecture": "x64",
"target_os": "windows"
},
"extensions": {
"code_assets": {
"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"
}
},
"linking_enabled": false
},
"out_dir": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\out\\",
Expand Down
15 changes: 15 additions & 0 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 @@ -28,6 +28,21 @@
},
"target_architecture": "arm64",
"target_os": "macos"
},
"extensions": {
"code_assets": {
"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"
}
}
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
Expand Down
Loading