diff --git a/pkgs/code_assets/test/data/build_input_android.json b/pkgs/code_assets/test/data/build_input_android.json index 6bf81193e8..b9bd4f8d4f 100644 --- a/pkgs/code_assets/test/data/build_input_android.json +++ b/pkgs/code_assets/test/data/build_input_android.json @@ -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/" } diff --git a/pkgs/code_assets/test/data/build_input_ios.json b/pkgs/code_assets/test/data/build_input_ios.json index 2267ce1a0e..42be97e836 100644 --- a/pkgs/code_assets/test/data/build_input_ios.json +++ b/pkgs/code_assets/test/data/build_input_ios.json @@ -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/" } diff --git a/pkgs/code_assets/test/data/build_input_linux.json b/pkgs/code_assets/test/data/build_input_linux.json index 3a0fd4d2f5..ee947a4b81 100644 --- a/pkgs/code_assets/test/data/build_input_linux.json +++ b/pkgs/code_assets/test/data/build_input_linux.json @@ -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/" } diff --git a/pkgs/code_assets/test/data/build_input_macos.json b/pkgs/code_assets/test/data/build_input_macos.json index 035c259801..2a87ed6a34 100644 --- a/pkgs/code_assets/test/data/build_input_macos.json +++ b/pkgs/code_assets/test/data/build_input_macos.json @@ -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" + } } diff --git a/pkgs/code_assets/test/data/build_input_windows.json b/pkgs/code_assets/test/data/build_input_windows.json index 6bb6eab5f2..f4f9ebc9da 100644 --- a/pkgs/code_assets/test/data/build_input_windows.json +++ b/pkgs/code_assets/test/data/build_input_windows.json @@ -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\\" } diff --git a/pkgs/code_assets/test/data/build_output_android.json b/pkgs/code_assets/test/data/build_output_android.json index 8f33834623..6d0220a1c7 100644 --- a/pkgs/code_assets/test/data/build_output_android.json +++ b/pkgs/code_assets/test/data/build_output_android.json @@ -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" } diff --git a/pkgs/code_assets/test/data/build_output_linux.json b/pkgs/code_assets/test/data/build_output_linux.json index 666529d34e..41ee7915f1 100644 --- a/pkgs/code_assets/test/data/build_output_linux.json +++ b/pkgs/code_assets/test/data/build_output_linux.json @@ -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" } diff --git a/pkgs/code_assets/test/data/build_output_macos.json b/pkgs/code_assets/test/data/build_output_macos.json index 2811b72b16..36f5e30581 100644 --- a/pkgs/code_assets/test/data/build_output_macos.json +++ b/pkgs/code_assets/test/data/build_output_macos.json @@ -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" } diff --git a/pkgs/code_assets/test/data/build_output_windows.json b/pkgs/code_assets/test/data/build_output_windows.json index 8009fb6749..f6065f4ce1 100644 --- a/pkgs/code_assets/test/data/build_output_windows.json +++ b/pkgs/code_assets/test/data/build_output_windows.json @@ -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" } diff --git a/pkgs/code_assets/test/data/link_input_macos.json b/pkgs/code_assets/test/data/link_input_macos.json index a0c5c65673..8e80a3c662 100644 --- a/pkgs/code_assets/test/data/link_input_macos.json +++ b/pkgs/code_assets/test/data/link_input_macos.json @@ -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" + } } diff --git a/pkgs/code_assets/test/data/link_output_macos.json b/pkgs/code_assets/test/data/link_output_macos.json index 9403466a33..186b408b9a 100644 --- a/pkgs/code_assets/test/data/link_output_macos.json +++ b/pkgs/code_assets/test/data/link_output_macos.json @@ -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" } diff --git a/pkgs/data_assets/test/data/build_input.json b/pkgs/data_assets/test/data/build_input.json index 441a1d9316..87f4a426d6 100644 --- a/pkgs/data_assets/test/data/build_input.json +++ b/pkgs/data_assets/test/data/build_input.json @@ -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" + } } diff --git a/pkgs/data_assets/test/data/build_output.json b/pkgs/data_assets/test/data/build_output.json index 4d020d3d8b..6722db2273 100644 --- a/pkgs/data_assets/test/data/build_output.json +++ b/pkgs/data_assets/test/data/build_output.json @@ -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" } diff --git a/pkgs/data_assets/test/data/link_input.json b/pkgs/data_assets/test/data/link_input.json index fa64acfc65..9393769a7a 100644 --- a/pkgs/data_assets/test/data/link_input.json +++ b/pkgs/data_assets/test/data/link_input.json @@ -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" + } } diff --git a/pkgs/data_assets/test/data/link_output.json b/pkgs/data_assets/test/data/link_output.json index 315a6462c1..c97f6f4912 100644 --- a/pkgs/data_assets/test/data/link_output.json +++ b/pkgs/data_assets/test/data/link_output.json @@ -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" } diff --git a/pkgs/hooks/doc/schema/hook/shared_definitions.schema.json b/pkgs/hooks/doc/schema/hook/shared_definitions.schema.json index 17d5756811..f4f73cfc6d 100644 --- a/pkgs/hooks/doc/schema/hook/shared_definitions.schema.json +++ b/pkgs/hooks/doc/schema/hook/shared_definitions.schema.json @@ -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": { diff --git a/pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json b/pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json index 2a6acce1f6..cecabae5f3 100644 --- a/pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json +++ b/pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json @@ -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", diff --git a/pkgs/hooks/doc/schema/shared/shared_definitions.schema.json b/pkgs/hooks/doc/schema/shared/shared_definitions.schema.json index 06b98d4df1..68a992377d 100644 --- a/pkgs/hooks/doc/schema/shared/shared_definitions.schema.json +++ b/pkgs/hooks/doc/schema/shared/shared_definitions.schema.json @@ -159,9 +159,6 @@ "config": { "$ref": "#/definitions/Config" }, - "out_dir": { - "$ref": "#/definitions/absolutePath" - }, "out_dir_shared": { "$ref": "#/definitions/absolutePath" }, @@ -181,15 +178,12 @@ "$ref": "#/definitions/UserDefinesSource" } } - }, - "version": { - "type": "string" } }, "required": [ "config", - "out_dir", "out_dir_shared", + "out_file", "package_name", "package_root" ] @@ -214,9 +208,6 @@ }, "timestamp": { "type": "string" - }, - "version": { - "type": "string" } }, "required": [ diff --git a/pkgs/hooks/test/data/build_input.json b/pkgs/hooks/test/data/build_input.json index bb47d45e50..8fb174cd5c 100644 --- a/pkgs/hooks/test/data/build_input.json +++ b/pkgs/hooks/test/data/build_input.json @@ -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" + } } diff --git a/pkgs/hooks/test/data/build_output.json b/pkgs/hooks/test/data/build_output.json index c278d99c4a..fdd9632066 100644 --- a/pkgs/hooks/test/data/build_output.json +++ b/pkgs/hooks/test/data/build_output.json @@ -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" } diff --git a/pkgs/hooks/test/data/build_output_windows.json b/pkgs/hooks/test/data/build_output_windows.json index 03e8d0358a..2973976a0d 100644 --- a/pkgs/hooks/test/data/build_output_windows.json +++ b/pkgs/hooks/test/data/build_output_windows.json @@ -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" } diff --git a/pkgs/hooks/test/data/link_input.json b/pkgs/hooks/test/data/link_input.json index b5b5fcb52f..9807f499da 100644 --- a/pkgs/hooks/test/data/link_input.json +++ b/pkgs/hooks/test/data/link_input.json @@ -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" + } } diff --git a/pkgs/hooks/test/data/link_output.json b/pkgs/hooks/test/data/link_output.json index 84debb7470..2402f3d686 100644 --- a/pkgs/hooks/test/data/link_output.json +++ b/pkgs/hooks/test/data/link_output.json @@ -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" } diff --git a/pkgs/hooks/test/schema/helpers.dart b/pkgs/hooks/test/schema/helpers.dart index 915e7fcee0..8567114996 100644 --- a/pkgs/hooks/test/schema/helpers.dart +++ b/pkgs/hooks/test/schema/helpers.dart @@ -288,93 +288,58 @@ FieldsReturn _hookFields({ required InputOrOutput inputOrOutput, required Hook hook, required Party party, -}) { - void versionMissingExpectation(ValidationResults result) { - if (party == Party.sdk && inputOrOutput == InputOrOutput.input) { - // The writer must output this field. SDK must support older hooks reading - // it. - expect(result.isValid, isFalse); - } else if (party == Party.hook && inputOrOutput == InputOrOutput.output) { - // The writer must output this field. SDK must support older hooks reading - // it. - // Note: For some reason party:hook output does not register as required - // `package:json_schema`, but the JSON validator in vscode does properly - // mark it as required. - // Ignore this issue for now, we'll remove version soon. - // expect(result.isValid, isFalse); - } else { - // Newer hooks must support future SDKs not outputting a this field. - expect(result.isValid, isTrue); - } - } - - void outFileMissingExpectation(ValidationResults result) { - if (party == Party.sdk) { - // It's a new field, newer hooks will try to use it. SDKs must write it. - expect(result.isValid, isFalse); - } else { - // Older SDKs don't output the field. So, the reader must be okay not - // reading it. - expect(result.isValid, isTrue); - } - } - - return <(List, void Function(ValidationResults result))>[ - ([r'$schema'], expectOptionalFieldMissing), - (['version'], versionMissingExpectation), - if (inputOrOutput == InputOrOutput.input) ...[ - (['user_defines'], expectOptionalFieldMissing), - (['out_dir_shared'], expectRequiredFieldMissing), - (['out_dir'], expectRequiredFieldMissing), - (['package_name'], expectRequiredFieldMissing), - (['package_root'], expectRequiredFieldMissing), - (['config', 'build_asset_types'], expectRequiredFieldMissing), - if (hook == Hook.build) ...[ - (['config', 'linking_enabled'], expectRequiredFieldMissing), - (['dependency_metadata'], expectOptionalFieldMissing), - (['dependency_metadata', 'some_package'], expectOptionalFieldMissing), - ], - if (hook == Hook.link) ...[ - (['assets'], expectOptionalFieldMissing), - (['assets', 0], expectOptionalFieldMissing), - (['assets', 0, 'type'], expectRequiredFieldMissing), - ], - (['out_file'], outFileMissingExpectation), +}) => <(List, void Function(ValidationResults result))>[ + ([r'$schema'], expectOptionalFieldMissing), + if (inputOrOutput == InputOrOutput.input) ...[ + (['user_defines'], expectOptionalFieldMissing), + (['out_dir_shared'], expectRequiredFieldMissing), + (['package_name'], expectRequiredFieldMissing), + (['package_root'], expectRequiredFieldMissing), + (['config', 'build_asset_types'], expectRequiredFieldMissing), + if (hook == Hook.build) ...[ + (['config', 'linking_enabled'], expectRequiredFieldMissing), + (['dependency_metadata'], expectOptionalFieldMissing), + (['dependency_metadata', 'some_package'], expectOptionalFieldMissing), ], - if (inputOrOutput == InputOrOutput.output) ...[ - (['timestamp'], expectRequiredFieldMissing), - (['dependencies'], expectOptionalFieldMissing), - (['dependencies', 0], expectOptionalFieldMissing), - if (hook == Hook.build) ...[ - (['metadata'], expectOptionalFieldMissing), - for (final path in [ - ['assets_for_build'], - ['assetsForLinking', 'package_with_linker'], - ['assets_for_linking', 'package_with_linker'], - ]) ...[ - ([...path], expectOptionalFieldMissing), - ([...path, 0], expectOptionalFieldMissing), - ([...path, 0, 'type'], expectRequiredFieldMissing), - ([...path, 0, 'encoding'], expectOptionalFieldMissing), - ], - ], + if (hook == Hook.link) ...[ + (['assets'], expectOptionalFieldMissing), + (['assets', 0], expectOptionalFieldMissing), + (['assets', 0, 'type'], expectRequiredFieldMissing), ], - for (final path in [ - if (inputOrOutput == InputOrOutput.output || hook == Hook.link) - ['assets'], - if (inputOrOutput == InputOrOutput.output && hook == Hook.build) ...[ + (['out_file'], expectRequiredFieldMissing), + ], + if (inputOrOutput == InputOrOutput.output) ...[ + (['timestamp'], expectRequiredFieldMissing), + (['dependencies'], expectOptionalFieldMissing), + (['dependencies', 0], expectOptionalFieldMissing), + if (hook == Hook.build) ...[ + (['metadata'], expectOptionalFieldMissing), + for (final path in [ ['assets_for_build'], ['assetsForLinking', 'package_with_linker'], ['assets_for_linking', 'package_with_linker'], + ]) ...[ + ([...path], expectOptionalFieldMissing), + ([...path, 0], expectOptionalFieldMissing), + ([...path, 0, 'type'], expectRequiredFieldMissing), + ([...path, 0, 'encoding'], expectOptionalFieldMissing), ], - ]) ...[ - ([...path], expectOptionalFieldMissing), - ([...path, 0], expectOptionalFieldMissing), - ([...path, 0, 'type'], expectRequiredFieldMissing), - ([...path, 0, 'encoding'], expectOptionalFieldMissing), ], - ]; -} + ], + for (final path in [ + if (inputOrOutput == InputOrOutput.output || hook == Hook.link) ['assets'], + if (inputOrOutput == InputOrOutput.output && hook == Hook.build) ...[ + ['assets_for_build'], + ['assetsForLinking', 'package_with_linker'], + ['assets_for_linking', 'package_with_linker'], + ], + ]) ...[ + ([...path], expectOptionalFieldMissing), + ([...path, 0], expectOptionalFieldMissing), + ([...path, 0, 'type'], expectRequiredFieldMissing), + ([...path, 0, 'encoding'], expectOptionalFieldMissing), + ], +]; dynamic _traverseJson(dynamic json, List path) { while (path.isNotEmpty) { diff --git a/pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart b/pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart index 634ac23840..e60d2541c9 100644 --- a/pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart +++ b/pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart @@ -155,7 +155,6 @@ class NativeAssetsBuildRunner { packageName: package.name, packageRoot: packageLayout.packageRoot(package.name), outputFile: buildDirUri.resolve('output.json'), - outputDirectory: outDirUri, outputDirectoryShared: outDirSharedUri, userDefines: loadedUserDefines?[package.name], ); @@ -259,7 +258,6 @@ class NativeAssetsBuildRunner { packageName: package.name, packageRoot: packageLayout.packageRoot(package.name), outputFile: buildDirUri.resolve('output.json'), - outputDirectory: outDirUri, outputDirectoryShared: outDirSharedUri, userDefines: loadedUserDefines?[package.name], ); diff --git a/pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart b/pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart index 5df1e7d8f6..963288361c 100644 --- a/pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart +++ b/pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart @@ -36,7 +36,6 @@ void main() async { packageName: name, packageRoot: testPackageUri, outputFile: buildOutputUri, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_builder/test/test_data/transformer_test.dart b/pkgs/native_assets_builder/test/test_data/transformer_test.dart index 050f843d87..4124b9ccf9 100644 --- a/pkgs/native_assets_builder/test/test_data/transformer_test.dart +++ b/pkgs/native_assets_builder/test/test_data/transformer_test.dart @@ -47,7 +47,6 @@ void main() async { packageName: packageName, packageRoot: packageUri, outputFile: buildOutputUri, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output_3/hook/build.dart b/pkgs/native_assets_builder/test_data/wrong_build_output_3/hook/build.dart index c31882fdc3..1fd30eb42a 100644 --- a/pkgs/native_assets_builder/test_data/wrong_build_output_3/hook/build.dart +++ b/pkgs/native_assets_builder/test_data/wrong_build_output_3/hook/build.dart @@ -21,6 +21,5 @@ const _rightContents = '''{ "timestamp": "2023-07-28 14:22:45.000", "encodedAssets": [], "dependencies": [], - "metadata": {}, - "version": "1.9.0" + "metadata": {} }'''; diff --git a/pkgs/native_assets_cli/example/build/download_asset/tool/build.dart b/pkgs/native_assets_cli/example/build/download_asset/tool/build.dart index 96e15f6769..499127d5a4 100644 --- a/pkgs/native_assets_cli/example/build/download_asset/tool/build.dart +++ b/pkgs/native_assets_cli/example/build/download_asset/tool/build.dart @@ -61,10 +61,6 @@ BuildInput createBuildInput( String? iOSSdk, ) { final packageRoot = Platform.script.resolve('..'); - final targetName = createTargetName(osString, architecture, iOSSdk); - final outputDirectory = packageRoot.resolve( - '.dart_tool/download_asset/$targetName/', - ); final outputDirectoryShared = packageRoot.resolve( '.dart_tool/download_asset/shared/', ); @@ -79,7 +75,6 @@ BuildInput createBuildInput( packageRoot: packageRoot, packageName: 'download_asset', outputFile: outputFile, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_cli/lib/src/config.dart b/pkgs/native_assets_cli/lib/src/config.dart index 5853566900..de1b2c8735 100644 --- a/pkgs/native_assets_cli/lib/src/config.dart +++ b/pkgs/native_assets_cli/lib/src/config.dart @@ -142,7 +142,6 @@ extension type HookInputUserDefines._(HookInput _input) { sealed class HookInputBuilder { final _syntax = syntax.HookInput.fromJson({}) - ..version = latestVersion.toString() ..config = syntax.Config(buildAssetTypes: [], extensions: null); Map get json => _syntax.json; @@ -155,15 +154,12 @@ sealed class HookInputBuilder { 'It must still be provided to accommodate `HookInput`s in hooks using an ' 'older version of this package.', ) - required Uri outputDirectory, required Uri outputDirectoryShared, required Uri outputFile, PackageUserDefines? userDefines, }) { - _syntax.version = latestVersion.toString(); _syntax.packageRoot = packageRoot; _syntax.packageName = packageName; - _syntax.outDir = outputDirectory; _syntax.outDirShared = outputDirectoryShared; _syntax.outFile = outputFile; _syntax.userDefines = userDefines?.toSyntax(); @@ -204,8 +200,7 @@ final class BuildInput extends HookInput { }; @override - Uri get outputFile => - _syntax.outFile ?? _syntax.outDir.resolve('build_output.json'); + Uri get outputFile => _syntax.outFile; final syntax.BuildInput _syntaxBuildInput; @@ -329,8 +324,7 @@ final class LinkInput extends HookInput { Uri? get recordedUsagesFile => _syntaxLinkInput.resourceIdentifiers; @override - Uri get outputFile => - _syntax.outFile ?? _syntax.outDir.resolve('link_output.json'); + Uri get outputFile => _syntax.outFile; final syntax.LinkInput _syntaxLinkInput; @@ -410,7 +404,6 @@ sealed class HookOutput { sealed class HookOutputBuilder { final _syntax = syntax.HookOutput( timestamp: DateTime.now().roundDownToSeconds().toString(), - version: latestVersion.toString(), assets: null, dependencies: null, ); diff --git a/pkgs/native_assets_cli/lib/src/hooks/syntax.g.dart b/pkgs/native_assets_cli/lib/src/hooks/syntax.g.dart index 02a7f54f9b..aca96e7ad9 100644 --- a/pkgs/native_assets_cli/lib/src/hooks/syntax.g.dart +++ b/pkgs/native_assets_cli/lib/src/hooks/syntax.g.dart @@ -129,13 +129,11 @@ class BuildInput extends HookInput { required Map>? assets, required BuildConfig config, required Map>? dependencyMetadata, - required super.outDir, required super.outDirShared, required super.outFile, required super.packageName, required super.packageRoot, required super.userDefines, - required super.version, }) : super(config: config) { _assets = assets; _dependencyMetadata = dependencyMetadata; @@ -239,7 +237,6 @@ class BuildOutput extends HookOutput { required super.dependencies, required JsonObject? metadata, required super.timestamp, - required super.version, }) : super() { this.assetsForLinkingOld = assetsForLinkingOld; this.assetsForBuild = assetsForBuild; @@ -483,22 +480,18 @@ class HookInput extends JsonObject { HookInput({ required Config config, - required Uri outDir, required Uri outDirShared, - required Uri? outFile, + required Uri outFile, required String packageName, required Uri packageRoot, required UserDefines? userDefines, - required String? version, }) : super() { this.config = config; - this.outDir = outDir; this.outDirShared = outDirShared; this.outFile = outFile; this.packageName = packageName; this.packageRoot = packageRoot; this.userDefines = userDefines; - this.version = version; json.sortOnKey(); } @@ -520,15 +513,6 @@ class HookInput extends JsonObject { return config.validate(); } - Uri get outDir => _reader.path$('out_dir'); - - set outDir(Uri value) { - json['out_dir'] = value.toFilePath(); - json.sortOnKey(); - } - - List _validateOutDir() => _reader.validatePath('out_dir'); - Uri get outDirShared => _reader.path$('out_dir_shared'); set outDirShared(Uri value) { @@ -539,14 +523,14 @@ class HookInput extends JsonObject { List _validateOutDirShared() => _reader.validatePath('out_dir_shared'); - Uri? get outFile => _reader.optionalPath('out_file'); + Uri get outFile => _reader.path$('out_file'); - set outFile(Uri? value) { - json.setOrRemove('out_file', value?.toFilePath()); + set outFile(Uri value) { + json['out_file'] = value.toFilePath(); json.sortOnKey(); } - List _validateOutFile() => _reader.validateOptionalPath('out_file'); + List _validateOutFile() => _reader.validatePath('out_file'); String get packageName => _reader.get('package_name'); @@ -586,26 +570,15 @@ class HookInput extends JsonObject { return userDefines?.validate() ?? []; } - String? get version => _reader.get('version'); - - set version(String? value) { - json.setOrRemove('version', value); - json.sortOnKey(); - } - - List _validateVersion() => _reader.validate('version'); - @override List validate() => [ ...super.validate(), ..._validateConfig(), - ..._validateOutDir(), ..._validateOutDirShared(), ..._validateOutFile(), ..._validatePackageName(), ..._validatePackageRoot(), ..._validateUserDefines(), - ..._validateVersion(), ]; @override @@ -619,12 +592,10 @@ class HookOutput extends JsonObject { required List? assets, required List? dependencies, required String timestamp, - required String? version, }) : super() { this.assets = assets; this.dependencies = dependencies; this.timestamp = timestamp; - this.version = version; json.sortOnKey(); } @@ -682,22 +653,12 @@ class HookOutput extends JsonObject { List _validateTimestamp() => _reader.validate('timestamp'); - String? get version => _reader.get('version'); - - set version(String? value) { - json.setOrRemove('version', value); - json.sortOnKey(); - } - - List _validateVersion() => _reader.validate('version'); - @override List validate() => [ ...super.validate(), ..._validateAssets(), ..._validateDependencies(), ..._validateTimestamp(), - ..._validateVersion(), ]; @override @@ -745,14 +706,12 @@ class LinkInput extends HookInput { LinkInput({ required List? assets, required super.config, - required super.outDir, required super.outDirShared, required super.outFile, required super.packageName, required super.packageRoot, required Uri? resourceIdentifiers, required super.userDefines, - required super.version, }) : super() { _assets = assets; _resourceIdentifiers = resourceIdentifiers; @@ -831,7 +790,6 @@ class LinkOutput extends HookOutput { required super.assets, required super.dependencies, required super.timestamp, - required super.version, }) : super(); @override diff --git a/pkgs/native_assets_cli/lib/test.dart b/pkgs/native_assets_cli/lib/test.dart index cd2b25fc06..00358dc658 100644 --- a/pkgs/native_assets_cli/lib/test.dart +++ b/pkgs/native_assets_cli/lib/test.dart @@ -52,7 +52,6 @@ Future testBuildHook({ packageRoot: Directory.current.uri, packageName: _readPackageNameFromPubspec(), outputFile: outputFile, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: true); diff --git a/pkgs/native_assets_cli/test/api/build_test.dart b/pkgs/native_assets_cli/test/api/build_test.dart index f3cf708b72..b06d42b42d 100644 --- a/pkgs/native_assets_cli/test/api/build_test.dart +++ b/pkgs/native_assets_cli/test/api/build_test.dart @@ -36,7 +36,6 @@ void main() async { packageRoot: tempUri, packageName: packageName, outputFile: outFile, - outputDirectory: outDirUri, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false); diff --git a/pkgs/native_assets_cli/test/build_input_test.dart b/pkgs/native_assets_cli/test/build_input_test.dart index 08064a2f81..25d178bb82 100644 --- a/pkgs/native_assets_cli/test/build_input_test.dart +++ b/pkgs/native_assets_cli/test/build_input_test.dart @@ -8,7 +8,6 @@ import 'dart:convert'; import 'dart:io'; import 'package:native_assets_cli/native_assets_cli_builder.dart'; -import 'package:native_assets_cli/src/config.dart' show latestVersion; import 'package:test/test.dart'; import 'helpers.dart'; @@ -73,11 +72,9 @@ void main() async { 'foo': {'key': 321}, }, 'out_dir_shared': outputDirectoryShared.toFilePath(), - 'out_dir': outDirUri.toFilePath(), 'out_file': outFile.toFilePath(), 'package_name': packageName, 'package_root': packageRootUri.toFilePath(), - 'version': latestVersion.toString(), }; }); @@ -87,7 +84,6 @@ void main() async { packageName: packageName, packageRoot: packageRootUri, outputFile: outFile, - outputDirectory: outDirUri, outputDirectoryShared: outputDirectoryShared, ) ..config.addBuildAssetTypes(['my-asset-type']) diff --git a/pkgs/native_assets_cli/test/build_output_test.dart b/pkgs/native_assets_cli/test/build_output_test.dart index 4ca12d078c..71e4d710f3 100644 --- a/pkgs/native_assets_cli/test/build_output_test.dart +++ b/pkgs/native_assets_cli/test/build_output_test.dart @@ -55,7 +55,6 @@ void main() { // The JSON format of the build output. final expectedJson = { - 'version': '1.9.0', 'dependencies': ['path0', 'path1', 'path2'], 'metadata': { 'meta-a': 'meta-b', diff --git a/pkgs/native_assets_cli/test/code_assets/config_test.dart b/pkgs/native_assets_cli/test/code_assets/config_test.dart index 0e8263ad41..f25c995481 100644 --- a/pkgs/native_assets_cli/test/code_assets/config_test.dart +++ b/pkgs/native_assets_cli/test/code_assets/config_test.dart @@ -11,7 +11,6 @@ import 'package:test/test.dart'; import '../helpers.dart'; void main() async { - late Uri outDirUri; late Uri outputDirectoryShared; late Uri outFile; late String packageName; @@ -24,7 +23,6 @@ void main() async { setUp(() async { final tempUri = Directory.systemTemp.uri; - outDirUri = tempUri.resolve('out1/'); outFile = tempUri.resolve('output.json'); outputDirectoryShared = tempUri.resolve('out_shared1/'); packageName = 'my_package'; @@ -92,11 +90,9 @@ void main() async { if (hookType == 'build') 'linking_enabled': false, }, 'out_dir_shared': outputDirectoryShared.toFilePath(), - 'out_dir': outDirUri.toFilePath(), 'out_file': outFile.toFilePath(), 'package_name': packageName, 'package_root': packageRootUri.toFilePath(), - 'version': '1.9.0', }; } @@ -127,7 +123,6 @@ void main() async { packageName: packageName, packageRoot: packageRootUri, outputFile: outFile, - outputDirectory: outDirUri, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) @@ -173,7 +168,6 @@ void main() async { packageName: packageName, packageRoot: packageRootUri, outputFile: outFile, - outputDirectory: outDirUri, outputDirectoryShared: outputDirectoryShared, ) ..setupLink(assets: assets, recordedUsesFile: null) diff --git a/pkgs/native_assets_cli/test/code_assets/validation_test.dart b/pkgs/native_assets_cli/test/code_assets/validation_test.dart index 7ee22dcfb7..657f89a082 100644 --- a/pkgs/native_assets_cli/test/code_assets/validation_test.dart +++ b/pkgs/native_assets_cli/test/code_assets/validation_test.dart @@ -38,7 +38,6 @@ void main() { packageName: packageName, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: outDirUri, outputDirectoryShared: outDirSharedUri, ) ..config.setupBuild(linkingEnabled: false); diff --git a/pkgs/native_assets_cli/test/data_assets/validation_test.dart b/pkgs/native_assets_cli/test/data_assets/validation_test.dart index 34951eff02..ee74bcde3e 100644 --- a/pkgs/native_assets_cli/test/data_assets/validation_test.dart +++ b/pkgs/native_assets_cli/test/data_assets/validation_test.dart @@ -36,7 +36,6 @@ void main() { packageName: packageName, packageRoot: tempUri.resolve('$packageName/'), outputFile: tempUri.resolve('output.json'), - outputDirectory: outDirUri, outputDirectoryShared: outDirSharedUri, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_cli/test/example/local_asset_test.dart b/pkgs/native_assets_cli/test/example/local_asset_test.dart index 4bce18d348..0e6422f08a 100644 --- a/pkgs/native_assets_cli/test/example/local_asset_test.dart +++ b/pkgs/native_assets_cli/test/example/local_asset_test.dart @@ -42,7 +42,6 @@ void main() async { packageRoot: testPackageUri, packageName: name, outputFile: buildOutputUri, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_cli/test/example/native_add_library_test.dart b/pkgs/native_assets_cli/test/example/native_add_library_test.dart index e146c2c77e..1aa9b97c5d 100644 --- a/pkgs/native_assets_cli/test/example/native_add_library_test.dart +++ b/pkgs/native_assets_cli/test/example/native_add_library_test.dart @@ -42,7 +42,6 @@ void main() async { packageRoot: testPackageUri, packageName: name, outputFile: buildOutputUri, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_cli/test/example/native_dynamic_linking_test.dart b/pkgs/native_assets_cli/test/example/native_dynamic_linking_test.dart index a726111205..09cdc28928 100644 --- a/pkgs/native_assets_cli/test/example/native_dynamic_linking_test.dart +++ b/pkgs/native_assets_cli/test/example/native_dynamic_linking_test.dart @@ -46,7 +46,6 @@ void main() async { packageRoot: testPackageUri, packageName: name, outputFile: buildOutputUri, - outputDirectory: outputDirectory, outputDirectoryShared: outputDirectoryShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_assets_cli/test/link_input_test.dart b/pkgs/native_assets_cli/test/link_input_test.dart index 1613278452..c11cffc711 100644 --- a/pkgs/native_assets_cli/test/link_input_test.dart +++ b/pkgs/native_assets_cli/test/link_input_test.dart @@ -6,7 +6,6 @@ import 'dart:convert'; import 'dart:io'; import 'package:native_assets_cli/native_assets_cli_builder.dart'; -import 'package:native_assets_cli/src/config.dart' show latestVersion; import 'package:test/test.dart'; void main() async { @@ -36,11 +35,9 @@ void main() async { 'build_asset_types': ['asset-type-1', 'asset-type-2'], }, 'out_dir_shared': outputDirectoryShared.toFilePath(), - 'out_dir': outDirUri.toFilePath(), 'out_file': outFile.toFilePath(), 'package_name': packageName, 'package_root': packageRootUri.toFilePath(), - 'version': latestVersion.toString(), }; }); @@ -50,7 +47,6 @@ void main() async { packageName: packageName, packageRoot: packageRootUri, outputFile: outFile, - outputDirectory: outDirUri, outputDirectoryShared: outputDirectoryShared, ) ..config.addBuildAssetTypes(['asset-type-1', 'asset-type-2']) diff --git a/pkgs/native_assets_cli/test/link_output_test.dart b/pkgs/native_assets_cli/test/link_output_test.dart index f8a47192f7..204be21fe2 100644 --- a/pkgs/native_assets_cli/test/link_output_test.dart +++ b/pkgs/native_assets_cli/test/link_output_test.dart @@ -33,7 +33,6 @@ void main() { // The JSON format of the link output. { - 'version': '1.9.0', 'dependencies': ['path0', 'path1', 'path2'], 'assets': [ { @@ -53,10 +52,4 @@ void main() { expect(input.json[k], equals(v)); }); }); - - for (final version in ['9001.0.0', '0.0.1']) { - test('LinkOutput version $version', () { - expect(() => LinkOutput({'version': version}), isNot(throwsException)); - }); - } } diff --git a/pkgs/native_assets_cli/test/validation_test.dart b/pkgs/native_assets_cli/test/validation_test.dart index 026550795b..284929765c 100644 --- a/pkgs/native_assets_cli/test/validation_test.dart +++ b/pkgs/native_assets_cli/test/validation_test.dart @@ -35,7 +35,6 @@ void main() { packageName: packageName, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: outDirUri, outputDirectoryShared: outDirSharedUri, ) ..config.setupBuild(linkingEnabled: false); diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart index 65630e0e09..2b03e44854 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart @@ -36,7 +36,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart index f591563ed9..ed3d96c331 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart @@ -145,7 +145,6 @@ Future buildLib( packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUriShared, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart index 16b80f5084..c30a1c46ca 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart @@ -77,7 +77,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -240,7 +239,6 @@ Future buildLib( packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart index e5f438260e..3274630cc7 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart @@ -49,7 +49,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart index 1f2eef0843..a247ee0a3c 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart @@ -61,7 +61,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -166,7 +165,6 @@ Future buildLib( packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart index 0c8f86296b..b056727836 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart @@ -91,7 +91,6 @@ void main() async { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart index 1a419bab72..010f760f98 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart @@ -55,7 +55,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -138,7 +137,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false); @@ -249,7 +247,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -316,7 +313,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -375,7 +371,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -445,7 +440,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -514,7 +508,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -601,7 +594,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -705,7 +697,6 @@ Future testDefines({ packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/cbuilder/compiler_resolver_test.dart b/pkgs/native_toolchain_c/test/cbuilder/compiler_resolver_test.dart index 2bc8a5832a..9cabadd158 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/compiler_resolver_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/compiler_resolver_test.dart @@ -49,7 +49,6 @@ void main() { packageName: 'dummy', packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) @@ -105,7 +104,6 @@ void main() { packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), outputDirectoryShared: tempUri2, - outputDirectory: tempUri, ) ..config.setupBuild(linkingEnabled: false) ..addExtension( diff --git a/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart b/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart index 68a40adec6..2124fc2860 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart @@ -40,7 +40,6 @@ void main() { packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart b/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart index e4a7b29d9e..d6f2fe673d 100644 --- a/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart +++ b/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart @@ -32,7 +32,6 @@ Future buildTestArchive( packageName: name, packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..config.setupBuild(linkingEnabled: false) diff --git a/pkgs/native_toolchain_c/test/clinker/objects_test.dart b/pkgs/native_toolchain_c/test/clinker/objects_test.dart index d7e725d30f..6cda08065e 100644 --- a/pkgs/native_toolchain_c/test/clinker/objects_test.dart +++ b/pkgs/native_toolchain_c/test/clinker/objects_test.dart @@ -37,7 +37,6 @@ Future main() async { packageName: 'testpackage', packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..setupLink(assets: [], recordedUsesFile: null) diff --git a/pkgs/native_toolchain_c/test/clinker/throws_test.dart b/pkgs/native_toolchain_c/test/clinker/throws_test.dart index da967bcb6e..0d6b0476b0 100644 --- a/pkgs/native_toolchain_c/test/clinker/throws_test.dart +++ b/pkgs/native_toolchain_c/test/clinker/throws_test.dart @@ -27,7 +27,6 @@ Future main() async { packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), outputDirectoryShared: tempUri2, - outputDirectory: tempUri, ) ..setupLink(assets: [], recordedUsesFile: null) ..addExtension( diff --git a/pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart b/pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart index 60486fb1da..70942b223a 100644 --- a/pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart +++ b/pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart @@ -69,7 +69,6 @@ Future runTests(List architectures) async { packageName: 'testpackage', packageRoot: tempUri, outputFile: tempUri.resolve('output.json'), - outputDirectory: tempUri, outputDirectoryShared: tempUri2, ) ..setupLink(assets: [], recordedUsesFile: null)