Skip to content

[native_assets_cli] Cleanup JSON: version, out_dir, and out_file #2222

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 23, 2025
Merged

[native_assets_cli] Cleanup JSON: version, out_dir, and out_file #2222

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
4 changes: 1 addition & 3 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 @@ -21,10 +21,8 @@
},
"linking_enabled": true
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/Hook.build/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"version": "1.9.0"
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/"
}
4 changes: 1 addition & 3 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 @@ -22,10 +22,8 @@
},
"linking_enabled": false
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/51d66b45a7c440edc44bf124509a5dda/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/51d66b45a7c440edc44bf124509a5dda/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"version": "1.9.0"
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/"
}
4 changes: 1 addition & 3 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 @@ -18,10 +18,8 @@
},
"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/",
"out_dir_shared": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/Hook.build/",
"out_file": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/output.json",
"package_name": "my_package",
"package_root": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/",
"version": "1.9.0"
"package_root": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/"
}
4 changes: 1 addition & 3 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 @@ -44,13 +44,11 @@
}
}
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"user_defines": {
"some_key": "some_value"
},
"version": "1.9.0"
}
}
4 changes: 1 addition & 3 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 @@ -26,10 +26,8 @@
},
"linking_enabled": false
},
"out_dir": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\out\\",
"out_dir_shared": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\shared\\my_package\\Hook.build\\",
"out_file": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\output.json",
"package_name": "my_package",
"package_root": "C:\\src\\dacoharkes\\playground\\my_package\\",
"version": "1.9.0"
"package_root": "C:\\src\\dacoharkes\\playground\\my_package\\"
}
3 changes: 1 addition & 2 deletions pkgs/code_assets/test/data/build_output_android.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
"dependencies": [
"/Users/dacoharkes/src/dacoharkes/playground/my_package/src/my_package.c"
],
"timestamp": "2025-02-17 18:23:19.000",
"version": "1.9.0"
"timestamp": "2025-02-17 18:23:19.000"
}
3 changes: 1 addition & 2 deletions pkgs/code_assets/test/data/build_output_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
"dependencies": [
"/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/src/my_package.c"
],
"timestamp": "2025-02-17 17:36:39.000",
"version": "1.9.0"
"timestamp": "2025-02-17 17:36:39.000"
}
3 changes: 1 addition & 2 deletions pkgs/code_assets/test/data/build_output_macos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,5 @@
"dependencies": [
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/src/native_add.c"
],
"timestamp": "2025-02-10 16:47:01.000",
"version": "1.9.0"
"timestamp": "2025-02-10 16:47:01.000"
}
3 changes: 1 addition & 2 deletions pkgs/code_assets/test/data/build_output_windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
"dependencies": [
"C:\\src\\dacoharkes\\playground\\my_package\\src\\my_package.c"
],
"timestamp": "2025-02-17 09:57:36.000",
"version": "1.9.0"
"timestamp": "2025-02-17 09:57:36.000"
}
4 changes: 1 addition & 3 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 @@ -42,13 +42,11 @@
}
}
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/link/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"user_defines": {
"some_key": "some_value"
},
"version": "1.9.0"
}
}
3 changes: 1 addition & 2 deletions pkgs/code_assets/test/data/link_output_macos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,5 @@
"dependencies": [
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/src/native_add.c"
],
"timestamp": "2025-02-10 16:47:01.000",
"version": "1.9.0"
"timestamp": "2025-02-10 16:47:01.000"
}
4 changes: 1 addition & 3 deletions pkgs/data_assets/test/data/build_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@
}
}
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"user_defines": {
"some_key": "some_value"
},
"version": "1.9.0"
}
}
3 changes: 1 addition & 2 deletions pkgs/data_assets/test/data/build_output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,5 @@
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_2.json",
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_3.json"
],
"timestamp": "2025-02-11 11:20:20.000",
"version": "1.9.0"
"timestamp": "2025-02-11 11:20:20.000"
}
4 changes: 1 addition & 3 deletions pkgs/data_assets/test/data/link_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@
],
"linking_enabled": false
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/link/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"user_defines": {
"some_key": "some_value"
},
"version": "1.9.0"
}
}
3 changes: 1 addition & 2 deletions pkgs/data_assets/test/data/link_output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_2.json",
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_3.json"
],
"timestamp": "2025-02-11 11:20:20.000",
"version": "1.9.0"
"timestamp": "2025-02-11 11:20:20.000"
}
20 changes: 2 additions & 18 deletions pkgs/hooks/doc/schema/hook/shared_definitions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,9 @@
},
"unevaluatedProperties": false
},
"HookInput": {
"properties": {
"out_dir": {
"$comment": "Future SDKs will no longer provide 'out_dir'. Use a unique subdirectory of 'out_dir_shared' instead.",
"deprecated": true
},
"out_file": {
"$comment": "'out_file' is not provided by older SDKs. Then, it must be $out_dir/output.json."
},
"version": {
"$comment": "Future SDKs will no longer provide 'version'.",
"deprecated": true
}
}
},
"HookInput": {},
"HookOutput": {
"required": [
"version"
]
"required": []
},
"LinkInput": {},
"LinkOutput": {
Expand Down
18 changes: 1 addition & 17 deletions pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,7 @@
}
}
},
"HookInput": {
"properties": {
"out_dir": {
"$comment": "'out_dir' is read by older hooks, so it must still be emitted."
},
"out_file": {
"$comment": "'out_file' is not read by older hooks. If the file doesn't exist, then it must be $out_dir/output.json."
},
"version": {
"$comment": "Older SDKs will read 'version', so it must be provided."
}
},
"required": [
"out_file",
"version"
]
},
"HookInput": {},
"HookOutput": {},
"LinkInput": {
"$ref": "../shared/shared_definitions.schema.json#/definitions/LinkInput",
Expand Down
11 changes: 1 addition & 10 deletions pkgs/hooks/doc/schema/shared/shared_definitions.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@
"config": {
"$ref": "#/definitions/Config"
},
"out_dir": {
"$ref": "#/definitions/absolutePath"
},
"out_dir_shared": {
"$ref": "#/definitions/absolutePath"
},
Expand All @@ -181,15 +178,12 @@
"$ref": "#/definitions/UserDefinesSource"
}
}
},
"version": {
"type": "string"
}
},
"required": [
"config",
"out_dir",
"out_dir_shared",
"out_file",
"package_name",
"package_root"
]
Expand All @@ -214,9 +208,6 @@
},
"timestamp": {
"type": "string"
},
"version": {
"type": "string"
}
},
"required": [
Expand Down
4 changes: 1 addition & 3 deletions pkgs/hooks/test/data/build_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@
}
}
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"user_defines": {
"some_key": "some_value"
},
"version": "1.9.0"
}
}
3 changes: 1 addition & 2 deletions pkgs/hooks/test/data/build_output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,5 @@
"bar": "baz"
}
},
"timestamp": "2025-02-11 11:20:20.000",
"version": "1.9.0"
"timestamp": "2025-02-11 11:20:20.000"
}
3 changes: 1 addition & 2 deletions pkgs/hooks/test/data/build_output_windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
"dependencies": [
"C:\\src\\dacoharkes\\playground\\my_package\\src\\my_package.c"
],
"timestamp": "2025-02-17 09:57:36.000",
"version": "1.9.0"
"timestamp": "2025-02-17 09:57:36.000"
}
4 changes: 1 addition & 3 deletions pkgs/hooks/test/data/link_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
"some_other_asset_type"
]
},
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/link/",
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
"package_name": "my_package",
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
"user_defines": {
"some_key": "some_value"
},
"version": "1.9.0"
}
}
3 changes: 1 addition & 2 deletions pkgs/hooks/test/data/link_output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_2.json",
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_3.json"
],
"timestamp": "2025-02-11 11:20:20.000",
"version": "1.9.0"
"timestamp": "2025-02-11 11:20:20.000"
}
Loading
Loading