diff --git a/pkgs/native_assets_builder/pubspec.yaml b/pkgs/native_assets_builder/pubspec.yaml index 387839ec9..3b6718b37 100644 --- a/pkgs/native_assets_builder/pubspec.yaml +++ b/pkgs/native_assets_builder/pubspec.yaml @@ -13,9 +13,9 @@ dependencies: collection: ^1.18.0 graphs: ^2.3.1 logging: ^1.2.0 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../native_assets_cli/ package_config: ^2.1.0 yaml: ^3.1.2 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml index d73644401..60df3946d 100644 --- a/pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 meta: ^1.12.0 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml index 7c3dc2cb9..ec27346b1 100644 --- a/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml @@ -12,9 +12,9 @@ dependencies: complex_link_helper: path: ../complex_link_helper/ logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: lints: ^3.0.0 diff --git a/pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml b/pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml index 9d6a6c1f0..2221778d1 100644 --- a/pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: lints: ^3.0.0 diff --git a/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml b/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml index ec76b0a39..1b415be82 100644 --- a/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: cyclic_package_2: path: ../cyclic_package_2 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml b/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml index 7dd179f65..2d7f12d49 100644 --- a/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: cyclic_package_1: path: ../cyclic_package_1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml index 0bfa7ccb5..a4825338e 100644 --- a/pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 meta: ^1.12.0 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml index 6724d21d3..4d3364096 100644 --- a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml index 90794c99e..29b16af98 100644 --- a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: fail_on_os_sdk_version_linker: path: ../fail_on_os_sdk_version_linker/ - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml index ca1cc14fd..686d4f28c 100644 --- a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml index a57c6eed9..864ea7f0f 100644 --- a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml index fdd489b14..c36270a45 100644 --- a/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml index 5cbba7125..eea4ae3af 100644 --- a/pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml @@ -11,9 +11,9 @@ dependencies: logging: ^1.1.1 native_add: path: ../native_add/ - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml index b654820ba..ec709fe7c 100644 --- a/pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.1 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.2 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml index 6ce9a56df..d707000d6 100644 --- a/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml index 0aade4602..10a1e568c 100644 --- a/pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 meta: ^1.12.0 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: lints: ^3.0.0 diff --git a/pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml b/pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml index 4e74cfa16..857ca5021 100644 --- a/pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ package_with_metadata: path: ../package_with_metadata/ yaml: ^3.1.1 diff --git a/pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml b/pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml index 3719d79d6..3e0b112a6 100644 --- a/pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/simple_data_asset/pubspec.yaml b/pkgs/native_assets_builder/test_data/simple_data_asset/pubspec.yaml index fb939b97e..cf3441328 100644 --- a/pkgs/native_assets_builder/test_data/simple_data_asset/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/simple_data_asset/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: lints: ^3.0.0 diff --git a/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml index ee548f137..d56dd1a53 100644 --- a/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ dev_dependencies: lints: ^3.0.0 diff --git a/pkgs/native_assets_builder/test_data/treeshaking_native_libs/pubspec.yaml b/pkgs/native_assets_builder/test_data/treeshaking_native_libs/pubspec.yaml index 183b87a0f..57e9e14b4 100644 --- a/pkgs/native_assets_builder/test_data/treeshaking_native_libs/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/treeshaking_native_libs/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml index 804fc82b7..0eb108d11 100644 --- a/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml index f3ec03d23..f057423ed 100644 --- a/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec.yaml index 155307ff7..66ccb3abd 100644 --- a/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml b/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml index b1556457b..3dfa7679e 100644 --- a/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec.yaml b/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec.yaml index b1556457b..3dfa7679e 100644 --- a/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec.yaml @@ -8,9 +8,9 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../native_assets_cli/ yaml: ^3.1.1 yaml_edit: ^2.1.0 diff --git a/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml b/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml index 12892faf0..ca28849c9 100644 --- a/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../../native_assets_cli/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_cli/example/build/native_add_library/pubspec.yaml b/pkgs/native_assets_cli/example/build/native_add_library/pubspec.yaml index b998d0a86..0287bfb20 100644 --- a/pkgs/native_assets_cli/example/build/native_add_library/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/native_add_library/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../../native_assets_cli/ # native_toolchain_c: ^0.5.3 native_toolchain_c: path: ../../../../native_toolchain_c/ diff --git a/pkgs/native_assets_cli/example/build/native_dynamic_linking/pubspec.yaml b/pkgs/native_assets_cli/example/build/native_dynamic_linking/pubspec.yaml index 2e599c209..10a8d1cfb 100644 --- a/pkgs/native_assets_cli/example/build/native_dynamic_linking/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/native_dynamic_linking/pubspec.yaml @@ -10,9 +10,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../../native_assets_cli/ # native_toolchain_c: ^0.5.2 native_toolchain_c: path: ../../../../native_toolchain_c/ diff --git a/pkgs/native_assets_cli/example/build/use_dart_api/pubspec.yaml b/pkgs/native_assets_cli/example/build/use_dart_api/pubspec.yaml index f3b0d5cd3..4d725fef0 100644 --- a/pkgs/native_assets_cli/example/build/use_dart_api/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/use_dart_api/pubspec.yaml @@ -9,9 +9,9 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../../native_assets_cli/ # native_toolchain_c: ^0.5.2 native_toolchain_c: path: ../../../../native_toolchain_c/ diff --git a/pkgs/native_assets_cli/example/link/package_with_assets/pubspec.yaml b/pkgs/native_assets_cli/example/link/package_with_assets/pubspec.yaml index e41d75ac0..f4eec3a4f 100644 --- a/pkgs/native_assets_cli/example/link/package_with_assets/pubspec.yaml +++ b/pkgs/native_assets_cli/example/link/package_with_assets/pubspec.yaml @@ -11,9 +11,9 @@ environment: dependencies: logging: ^1.1.1 meta: ^1.12.0 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../../../../native_assets_cli/ dev_dependencies: lints: ^3.0.0 diff --git a/pkgs/native_toolchain_c/CHANGELOG.md b/pkgs/native_toolchain_c/CHANGELOG.md index 440213f96..14db58242 100644 --- a/pkgs/native_toolchain_c/CHANGELOG.md +++ b/pkgs/native_toolchain_c/CHANGELOG.md @@ -1,6 +1,6 @@ -## 0.5.4-wip +## 0.5.4 -- Nothing yet. +- Bump `package:native_assets_cli` to `0.8.0`. ## 0.5.3 diff --git a/pkgs/native_toolchain_c/lib/native_toolchain_c.dart b/pkgs/native_toolchain_c/lib/native_toolchain_c.dart index ea6461625..fa001799d 100644 --- a/pkgs/native_toolchain_c/lib/native_toolchain_c.dart +++ b/pkgs/native_toolchain_c/lib/native_toolchain_c.dart @@ -6,7 +6,8 @@ library; export 'src/cbuilder/cbuilder.dart' show CBuilder; -export 'src/cbuilder/clinker.dart' show CLinker, LinkerOptions; +export 'src/cbuilder/clinker.dart' show CLinker; export 'src/cbuilder/language.dart' show Language; +export 'src/cbuilder/linker_options.dart' show LinkerOptions; export 'src/cbuilder/output_type.dart' show OutputType; export 'src/utils/env_from_bat.dart'; diff --git a/pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart b/pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart index 142ec9c30..28d86d9a5 100644 --- a/pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart +++ b/pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart @@ -15,8 +15,6 @@ import 'linkmode.dart'; import 'output_type.dart'; import 'run_cbuilder.dart'; -export 'linker_options.dart'; - /// Specification for linking an artifact with a C linker. //TODO(mosuem): This is currently only implemented for linux. // See also https://github.com/dart-lang/native/issues/1376 diff --git a/pkgs/native_toolchain_c/lib/src/cbuilder/linker_options.dart b/pkgs/native_toolchain_c/lib/src/cbuilder/linker_options.dart index e3599e21d..c324a66f4 100644 --- a/pkgs/native_toolchain_c/lib/src/cbuilder/linker_options.dart +++ b/pkgs/native_toolchain_c/lib/src/cbuilder/linker_options.dart @@ -4,9 +4,7 @@ import 'dart:io'; -import '../native_toolchain/apple_clang.dart'; -import '../native_toolchain/clang.dart'; -import '../native_toolchain/gcc.dart'; +import '../native_toolchain/tool_likeness.dart'; import '../tool/tool.dart'; /// Options to pass to the linker. @@ -60,18 +58,15 @@ class LinkerOptions { linkerScript = _createLinkerScript(symbols); Iterable _toLinkerSyntax(Tool linker, List flagList) { - if (linker == clang) { + if (linker.isClangLike) { return flagList.map((e) => '-Wl,$e'); - } else if (isClangLikeLinker(linker)) { + } else if (linker.isLdLike) { return flagList; } else { throw UnsupportedError('Linker flags for $linker are not supported'); } } - static bool isClangLikeLinker(Tool tool) => - tool == appleLd || tool == gnuLinker || tool == lld; - static Uri? _createLinkerScript(Iterable? symbols) { if (symbols == null) return null; final tempDir = Directory.systemTemp.createTempSync(); diff --git a/pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart b/pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart index 15954324e..3b31c92c4 100644 --- a/pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart +++ b/pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart @@ -7,12 +7,9 @@ import 'dart:math'; import 'package:logging/logging.dart'; import 'package:native_assets_cli/native_assets_cli.dart'; -import '../native_toolchain/apple_clang.dart'; -import '../native_toolchain/clang.dart'; -import '../native_toolchain/gcc.dart'; import '../native_toolchain/msvc.dart'; +import '../native_toolchain/tool_likeness.dart'; import '../native_toolchain/xcode.dart'; -import '../tool/tool.dart'; import '../tool/tool_instance.dart'; import '../utils/env_from_bat.dart'; import '../utils/run_process.dart'; @@ -114,7 +111,7 @@ class RunCBuilder { final toolInstance_ = linkerOptions != null ? await linker() : await compiler(); final tool = toolInstance_.tool; - if (isClangLikeCompiler(tool) || LinkerOptions.isClangLikeLinker(tool)) { + if (tool.isClangLike || tool.isLdLike) { await runClangLike(tool: toolInstance_); return; } else if (tool == cl) { @@ -124,9 +121,6 @@ class RunCBuilder { } } - static bool isClangLikeCompiler(Tool tool) => - tool == appleClang || tool == clang || tool == gcc; - Future runClangLike({required ToolInstance tool}) async { final isStaticLib = staticLibrary != null; Uri? archiver_; @@ -241,7 +235,7 @@ class RunCBuilder { installName!.toFilePath(), ], if (pic != null) - if (isClangLikeCompiler(toolInstance.tool)) ...[ + if (toolInstance.tool.isClangLike) ...[ if (pic!) ...[ if (dynamicLibrary != null) '-fPIC', // Using PIC for static libraries allows them to be linked into @@ -264,7 +258,7 @@ class RunCBuilder { // Tell the linker to generate a position-dependent executable. if (executable != null) '-no-pie', ], - ] else if (LinkerOptions.isClangLikeLinker(toolInstance.tool)) ...[ + ] else if (toolInstance.tool.isLdLike) ...[ if (pic!) ...[ if (executable != null) '--pie', ] else ...[ diff --git a/pkgs/native_toolchain_c/lib/src/native_toolchain/tool_likeness.dart b/pkgs/native_toolchain_c/lib/src/native_toolchain/tool_likeness.dart new file mode 100644 index 000000000..f3bc2ece6 --- /dev/null +++ b/pkgs/native_toolchain_c/lib/src/native_toolchain/tool_likeness.dart @@ -0,0 +1,14 @@ +// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import '../tool/tool.dart'; +import 'apple_clang.dart'; +import 'clang.dart'; +import 'gcc.dart'; + +extension ToolLikeness on Tool { + bool get isClangLike => this == appleClang || this == clang || this == gcc; + + bool get isLdLike => this == appleLd || this == gnuLinker || this == lld; +} diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml index 3e7ef09b0..cba02b945 100644 --- a/pkgs/native_toolchain_c/pubspec.yaml +++ b/pkgs/native_toolchain_c/pubspec.yaml @@ -1,11 +1,9 @@ name: native_toolchain_c description: >- A library to invoke the native C compiler installed on the host machine. -version: 0.5.4-wip +version: 0.5.4 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c -publish_to: none - topics: - compiler - ffi @@ -20,9 +18,9 @@ dependencies: glob: ^2.1.1 logging: ^1.1.1 meta: ^1.9.1 - # native_assets_cli: ^0.7.3 - native_assets_cli: - path: ../native_assets_cli/ + native_assets_cli: ^0.8.0 + # native_assets_cli: + # path: ../native_assets_cli/ pub_semver: ^2.1.3 dev_dependencies: