Skip to content

Commit 24f71bf

Browse files
dcharkesdcharkes
authored
[native_assets_cli] Cleanup JSON: version, out_dir, and out_file (#2222)
1 parent 75d4813 commit 24f71bf

File tree

57 files changed

+77
-296
lines changed

Some content is hidden

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

57 files changed

+77
-296
lines changed

‎pkgs/code_assets/test/data/build_input_android.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
},
2222
"linking_enabled": true
2323
},
24-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/out/",
2524
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/Hook.build/",
2625
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/output.json",
2726
"package_name": "my_package",
28-
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
29-
"version": "1.9.0"
27+
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/"
3028
}

‎pkgs/code_assets/test/data/build_input_ios.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
},
2323
"linking_enabled": false
2424
},
25-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/51d66b45a7c440edc44bf124509a5dda/out/",
2625
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
2726
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/51d66b45a7c440edc44bf124509a5dda/output.json",
2827
"package_name": "my_package",
29-
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
30-
"version": "1.9.0"
28+
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/"
3129
}

‎pkgs/code_assets/test/data/build_input_linux.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
},
1919
"linking_enabled": false
2020
},
21-
"out_dir": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/out/",
2221
"out_dir_shared": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/Hook.build/",
2322
"out_file": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/output.json",
2423
"package_name": "my_package",
25-
"package_root": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/",
26-
"version": "1.9.0"
24+
"package_root": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/"
2725
}

‎pkgs/code_assets/test/data/build_input_macos.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@
4444
}
4545
}
4646
},
47-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
4847
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
4948
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
5049
"package_name": "my_package",
5150
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
5251
"user_defines": {
5352
"some_key": "some_value"
54-
},
55-
"version": "1.9.0"
53+
}
5654
}

‎pkgs/code_assets/test/data/build_input_windows.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
},
2727
"linking_enabled": false
2828
},
29-
"out_dir": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\out\\",
3029
"out_dir_shared": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\shared\\my_package\\Hook.build\\",
3130
"out_file": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\output.json",
3231
"package_name": "my_package",
33-
"package_root": "C:\\src\\dacoharkes\\playground\\my_package\\",
34-
"version": "1.9.0"
32+
"package_root": "C:\\src\\dacoharkes\\playground\\my_package\\"
3533
}

‎pkgs/code_assets/test/data/build_output_android.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
"dependencies": [
1616
"/Users/dacoharkes/src/dacoharkes/playground/my_package/src/my_package.c"
1717
],
18-
"timestamp": "2025-02-17 18:23:19.000",
19-
"version": "1.9.0"
18+
"timestamp": "2025-02-17 18:23:19.000"
2019
}

‎pkgs/code_assets/test/data/build_output_linux.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
"dependencies": [
1616
"/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/src/my_package.c"
1717
],
18-
"timestamp": "2025-02-17 17:36:39.000",
19-
"version": "1.9.0"
18+
"timestamp": "2025-02-17 17:36:39.000"
2019
}

‎pkgs/code_assets/test/data/build_output_macos.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,5 @@
9393
"dependencies": [
9494
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/src/native_add.c"
9595
],
96-
"timestamp": "2025-02-10 16:47:01.000",
97-
"version": "1.9.0"
96+
"timestamp": "2025-02-10 16:47:01.000"
9897
}

‎pkgs/code_assets/test/data/build_output_windows.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
"dependencies": [
1616
"C:\\src\\dacoharkes\\playground\\my_package\\src\\my_package.c"
1717
],
18-
"timestamp": "2025-02-17 09:57:36.000",
19-
"version": "1.9.0"
18+
"timestamp": "2025-02-17 09:57:36.000"
2019
}

‎pkgs/code_assets/test/data/link_input_macos.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@
4242
}
4343
}
4444
},
45-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
4645
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/link/",
4746
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
4847
"package_name": "my_package",
4948
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
5049
"user_defines": {
5150
"some_key": "some_value"
52-
},
53-
"version": "1.9.0"
51+
}
5452
}

‎pkgs/code_assets/test/data/link_output_macos.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,5 @@
5353
"dependencies": [
5454
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/src/native_add.c"
5555
],
56-
"timestamp": "2025-02-10 16:47:01.000",
57-
"version": "1.9.0"
56+
"timestamp": "2025-02-10 16:47:01.000"
5857
}

‎pkgs/data_assets/test/data/build_input.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@
3535
}
3636
}
3737
},
38-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
3938
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
4039
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
4140
"package_name": "my_package",
4241
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
4342
"user_defines": {
4443
"some_key": "some_value"
45-
},
46-
"version": "1.9.0"
44+
}
4745
}

‎pkgs/data_assets/test/data/build_output.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,5 @@
8080
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_2.json",
8181
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_3.json"
8282
],
83-
"timestamp": "2025-02-11 11:20:20.000",
84-
"version": "1.9.0"
83+
"timestamp": "2025-02-11 11:20:20.000"
8584
}

‎pkgs/data_assets/test/data/link_input.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@
2424
],
2525
"linking_enabled": false
2626
},
27-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
2827
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/link/",
2928
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
3029
"package_name": "my_package",
3130
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
3231
"user_defines": {
3332
"some_key": "some_value"
34-
},
35-
"version": "1.9.0"
33+
}
3634
}

‎pkgs/data_assets/test/data/link_output.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@
2222
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_2.json",
2323
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_3.json"
2424
],
25-
"timestamp": "2025-02-11 11:20:20.000",
26-
"version": "1.9.0"
25+
"timestamp": "2025-02-11 11:20:20.000"
2726
}

‎pkgs/hooks/doc/schema/hook/shared_definitions.schema.json

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,9 @@
1212
},
1313
"unevaluatedProperties": false
1414
},
15-
"HookInput": {
16-
"properties": {
17-
"out_dir": {
18-
"$comment": "Future SDKs will no longer provide 'out_dir'. Use a unique subdirectory of 'out_dir_shared' instead.",
19-
"deprecated": true
20-
},
21-
"out_file": {
22-
"$comment": "'out_file' is not provided by older SDKs. Then, it must be $out_dir/output.json."
23-
},
24-
"version": {
25-
"$comment": "Future SDKs will no longer provide 'version'.",
26-
"deprecated": true
27-
}
28-
}
29-
},
15+
"HookInput": {},
3016
"HookOutput": {
31-
"required": [
32-
"version"
33-
]
17+
"required": []
3418
},
3519
"LinkInput": {},
3620
"LinkOutput": {

‎pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,7 @@
1616
}
1717
}
1818
},
19-
"HookInput": {
20-
"properties": {
21-
"out_dir": {
22-
"$comment": "'out_dir' is read by older hooks, so it must still be emitted."
23-
},
24-
"out_file": {
25-
"$comment": "'out_file' is not read by older hooks. If the file doesn't exist, then it must be $out_dir/output.json."
26-
},
27-
"version": {
28-
"$comment": "Older SDKs will read 'version', so it must be provided."
29-
}
30-
},
31-
"required": [
32-
"out_file",
33-
"version"
34-
]
35-
},
19+
"HookInput": {},
3620
"HookOutput": {},
3721
"LinkInput": {
3822
"$ref": "../shared/shared_definitions.schema.json#/definitions/LinkInput",

‎pkgs/hooks/doc/schema/shared/shared_definitions.schema.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@
159159
"config": {
160160
"$ref": "#/definitions/Config"
161161
},
162-
"out_dir": {
163-
"$ref": "#/definitions/absolutePath"
164-
},
165162
"out_dir_shared": {
166163
"$ref": "#/definitions/absolutePath"
167164
},
@@ -181,15 +178,12 @@
181178
"$ref": "#/definitions/UserDefinesSource"
182179
}
183180
}
184-
},
185-
"version": {
186-
"type": "string"
187181
}
188182
},
189183
"required": [
190184
"config",
191-
"out_dir",
192185
"out_dir_shared",
186+
"out_file",
193187
"package_name",
194188
"package_root"
195189
]
@@ -214,9 +208,6 @@
214208
},
215209
"timestamp": {
216210
"type": "string"
217-
},
218-
"version": {
219-
"type": "string"
220211
}
221212
},
222213
"required": [

‎pkgs/hooks/test/data/build_input.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@
3232
}
3333
}
3434
},
35-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
3635
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/build/",
3736
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
3837
"package_name": "my_package",
3938
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
4039
"user_defines": {
4140
"some_key": "some_value"
42-
},
43-
"version": "1.9.0"
41+
}
4442
}

‎pkgs/hooks/test/data/build_output.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,5 @@
7474
"bar": "baz"
7575
}
7676
},
77-
"timestamp": "2025-02-11 11:20:20.000",
78-
"version": "1.9.0"
77+
"timestamp": "2025-02-11 11:20:20.000"
7978
}

‎pkgs/hooks/test/data/build_output_windows.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717
"dependencies": [
1818
"C:\\src\\dacoharkes\\playground\\my_package\\src\\my_package.c"
1919
],
20-
"timestamp": "2025-02-17 09:57:36.000",
21-
"version": "1.9.0"
20+
"timestamp": "2025-02-17 09:57:36.000"
2221
}

‎pkgs/hooks/test/data/link_input.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
"some_other_asset_type"
2020
]
2121
},
22-
"out_dir": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/out/",
2322
"out_dir_shared": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/shared/my_package/link/",
2423
"out_file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/ca4e7d3d4e7b8912cbd24d9e8a6cecdc/output.json",
2524
"package_name": "my_package",
2625
"package_root": "/Users/dacoharkes/src/dacoharkes/playground/my_package/",
2726
"user_defines": {
2827
"some_key": "some_value"
29-
},
30-
"version": "1.9.0"
28+
}
3129
}

‎pkgs/hooks/test/data/link_output.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_2.json",
1515
"/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_3.json"
1616
],
17-
"timestamp": "2025-02-11 11:20:20.000",
18-
"version": "1.9.0"
17+
"timestamp": "2025-02-11 11:20:20.000"
1918
}

0 commit comments

Comments
 (0)