diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index 967159bd79..53b1150651 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -31,12 +31,11 @@ jobs: fail-fast: false matrix: os: [ubuntu, macos, windows] - sdk: [stable, dev] + sdk: [dev] package: [native_assets_builder, native_assets_cli, native_toolchain_c] # Breaking changes temporarily break the example run on the Dart SDK until native_assets_builder is rolled into the Dart SDK dev build. breaking-change: [false] - runs-on: ${{ matrix.os }}-latest defaults: diff --git a/.github/workflows/native_toolchain_c.yaml b/.github/workflows/native_toolchain_c.yaml index e6c7b97e08..4a05ade9f2 100644 --- a/.github/workflows/native_toolchain_c.yaml +++ b/.github/workflows/native_toolchain_c.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu] - sdk: [stable] + sdk: [dev] package: [native_toolchain_c] runs-on: ${{ matrix.os }}-latest @@ -41,13 +41,11 @@ jobs: - uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 with: ndk-version: r27 - if: ${{ matrix.sdk == 'stable' }} - run: dart pub get - name: Install native toolchains run: sudo apt-get update && sudo apt-get install gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-riscv64-linux-gnu - if: ${{ matrix.sdk == 'stable' && matrix.os == 'ubuntu' }} - run: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - run: echo "$PWD/depot_tools" >> $GITHUB_PATH @@ -57,4 +55,3 @@ jobs: - run: clang --version - run: dart test - if: ${{ matrix.sdk == 'stable' }} diff --git a/pkgs/native_assets_builder/CHANGELOG.md b/pkgs/native_assets_builder/CHANGELOG.md index 097238f285..7864cfaa9c 100644 --- a/pkgs/native_assets_builder/CHANGELOG.md +++ b/pkgs/native_assets_builder/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.15.0-wip + +- Bump `package:native_assets_cli` to 0.15.0. + ## 0.14.0 - Bump `package:native_assets_cli` to 0.14.0. diff --git a/pkgs/native_assets_builder/pubspec.yaml b/pkgs/native_assets_builder/pubspec.yaml index 14aead4407..7eafb6f123 100644 --- a/pkgs/native_assets_builder/pubspec.yaml +++ b/pkgs/native_assets_builder/pubspec.yaml @@ -1,11 +1,9 @@ name: native_assets_builder description: >- This package is the backend that invokes build hooks. -version: 0.14.0 +version: 0.15.0-wip repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_builder -# publish_to: none - resolution: workspace environment: @@ -18,7 +16,7 @@ dependencies: graphs: ^2.3.2 logging: ^1.3.0 meta: ^1.16.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 package_config: ^2.1.0 pub_semver: ^2.2.0 yaml: ^3.1.3 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 54fa448efb..486e3e6710 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 @@ -12,8 +12,8 @@ environment: dependencies: logging: ^1.3.0 meta: ^1.16.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: lints: ^5.1.1 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 0f07145bc8..16c01f9387 100644 --- a/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: complex_link_helper: path: ../complex_link_helper/ logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 eef0e72c23..8bb18d9270 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 @@ -12,7 +12,7 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 6f3b6ba5b5..f33db60f10 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 @@ -12,7 +12,7 @@ environment: dependencies: cyclic_package_2: path: ../cyclic_package_2 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 f1112a894c..f36289cf70 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 @@ -12,7 +12,7 @@ environment: dependencies: cyclic_package_1: path: ../cyclic_package_1 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml b/pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml index 547e27f07d..6df793a9a9 100644 --- a/pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: fail_build: path: ../fail_build/ - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.0 diff --git a/pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml b/pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml index 0eb7e5fb02..caebab44a4 100644 --- a/pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: depend_on_fail_build: path: ../depend_on_fail_build/ - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.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 80536e95c9..a2aa48b674 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 @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml index d265f134d5..09b1951a7a 100644 --- a/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.0 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 ce9ed0365c..9963e257e3 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.0 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 30f75f2278..179865e1a3 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 @@ -12,7 +12,7 @@ environment: dependencies: fail_on_os_sdk_version_linker: path: ../fail_on_os_sdk_version_linker/ - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.0 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 b3d9087666..b1c99beea3 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.0 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 bddc4df576..420a071ab6 100644 --- a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 3ac72c3487..32e11d8d1b 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 @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 cce64d75b8..36716dd0c7 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 @@ -13,8 +13,8 @@ dependencies: logging: ^1.3.0 native_add: path: ../native_add/ - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 2e27205ca6..8d21ca9f7f 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 @@ -12,8 +12,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 6c545a76ec..f2dfcaa02b 100644 --- a/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 198461932a..3e99dc5205 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 @@ -12,7 +12,7 @@ environment: dependencies: logging: ^1.3.0 meta: ^1.16.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml b/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml index 082a105381..c515f0b4fb 100644 --- a/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.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 e03befcf2b..f52dc1b0d0 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 package_with_metadata: path: ../package_with_metadata/ 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 09e9821d03..70c9ee6707 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml b/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml index 24fb6c556b..8d88586aaf 100644 --- a/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/reusable_dynamic_library/pubspec.yaml b/pkgs/native_assets_builder/test_data/reusable_dynamic_library/pubspec.yaml index b26b66f447..637adeba1d 100644 --- a/pkgs/native_assets_builder/test_data/reusable_dynamic_library/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/reusable_dynamic_library/pubspec.yaml @@ -13,8 +13,8 @@ environment: dependencies: logging: ^1.1.1 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 diff --git a/pkgs/native_assets_builder/test_data/reuse_dynamic_library/pubspec.yaml b/pkgs/native_assets_builder/test_data/reuse_dynamic_library/pubspec.yaml index 1b33b811ff..98cc215521 100644 --- a/pkgs/native_assets_builder/test_data/reuse_dynamic_library/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/reuse_dynamic_library/pubspec.yaml @@ -12,8 +12,8 @@ environment: dependencies: logging: ^1.1.1 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip reusable_dynamic_library: path: ../reusable_dynamic_library/ 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 a2c9a3a858..89af235a85 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 @@ -11,7 +11,7 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 4e627366c2..83ef6921f6 100644 --- a/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml b/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml index 732be6d03d..09e5e6dc90 100644 --- a/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 diff --git a/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml b/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml index 76d5be0092..5bfca4f0f8 100644 --- a/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: crypto: ^3.0.6 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 b4ea2bd808..34e6060d6a 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 @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 diff --git a/pkgs/native_assets_builder/test_data/use_all_api/pubspec.yaml b/pkgs/native_assets_builder/test_data/use_all_api/pubspec.yaml index 67120c309b..1cb1e75360 100644 --- a/pkgs/native_assets_builder/test_data/use_all_api/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/use_all_api/pubspec.yaml @@ -13,7 +13,7 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml b/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml index fcfa9a2d4b..84a335b46f 100644 --- a/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 8b008e48c1..483113fddb 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 42ae4586fc..e6e63f6213 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 1bd94eb101..2ce2503bd5 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 2fa9bd46b3..d0e7957c1c 100644 --- a/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 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 ec368ac6cb..b8880b1d10 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 @@ -10,7 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: lints: ^5.1.1 diff --git a/pkgs/native_assets_cli/CHANGELOG.md b/pkgs/native_assets_cli/CHANGELOG.md index 8dbd92b32f..5f8e35bbec 100644 --- a/pkgs/native_assets_cli/CHANGELOG.md +++ b/pkgs/native_assets_cli/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.15.0-0 + +- **Breaking change** JSON encoding migration: change written asset type to the + namespaced one. Still keep reading the old one. (Old build hooks will keep + working with new SDKs.) +- Bump SDK lower bound to version that understands namespaced asset types. + (Version 3.8.0-260.0.dev) + ## 0.14.0 - Added support for sending assets between build hooks via the `ToBuild` diff --git a/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml b/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml index 78b2b96c86..7d50909545 100644 --- a/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml @@ -13,8 +13,8 @@ environment: dependencies: crypto: ^3.0.6 logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: args: ^2.6.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 9fee8aaa2e..4a3e8542ca 100644 --- a/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 dev_dependencies: ffigen: ^18.0.0 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 67a7ae6a86..f0c5e57a38 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 @@ -12,8 +12,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 6d083f63b8..ac9d502de6 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 @@ -12,8 +12,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 diff --git a/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml b/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml index 784c755437..545a654605 100644 --- a/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 7f8a8a62d0..08d0a35e8e 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 @@ -11,8 +11,8 @@ environment: dependencies: logging: ^1.3.0 - native_assets_cli: ^0.14.0 - native_toolchain_c: ^0.11.0 + native_assets_cli: ^0.15.0-0 + native_toolchain_c: ^0.12.0-wip dev_dependencies: ffigen: ^18.0.0 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 463ea1dd50..5e24a4710b 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 @@ -12,7 +12,7 @@ environment: dependencies: logging: ^1.3.0 meta: ^1.16.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 record_use: ^0.3.0 dev_dependencies: diff --git a/pkgs/native_assets_cli/lib/native_assets_cli.dart b/pkgs/native_assets_cli/lib/native_assets_cli.dart index b0f16c6d96..d62fcd27b2 100644 --- a/pkgs/native_assets_cli/lib/native_assets_cli.dart +++ b/pkgs/native_assets_cli/lib/native_assets_cli.dart @@ -24,6 +24,7 @@ export 'src/config.dart' HookInput, LinkInput, LinkOutputBuilder, + PackageMetadata, ToAppBundle, ToBuildHooks, ToLinkHook; diff --git a/pkgs/native_assets_cli/lib/src/code_assets/code_asset.dart b/pkgs/native_assets_cli/lib/src/code_assets/code_asset.dart index ed17f59d77..d85192af40 100644 --- a/pkgs/native_assets_cli/lib/src/code_assets/code_asset.dart +++ b/pkgs/native_assets_cli/lib/src/code_assets/code_asset.dart @@ -179,7 +179,7 @@ extension CodeAssetType on CodeAsset { /// Write the old type to prevent old hooks and SDKs from failing. // TODO(https://github.com/dart-lang/native/issues/2132): Change this to the // new value after it has rolled. - static const String typeForAsset = syntax.NativeCodeAsset.typeValue; + static const String typeForAsset = syntax.NativeCodeAssetNew.typeValue; } extension EncodedCodeAsset on EncodedAsset { diff --git a/pkgs/native_assets_cli/lib/src/data_assets/data_asset.dart b/pkgs/native_assets_cli/lib/src/data_assets/data_asset.dart index b28f377a2f..cd76ddfcec 100644 --- a/pkgs/native_assets_cli/lib/src/data_assets/data_asset.dart +++ b/pkgs/native_assets_cli/lib/src/data_assets/data_asset.dart @@ -92,7 +92,7 @@ extension DataAssetType on DataAsset { /// Write the old type to prevent old hooks and SDKs from failing. // TODO(https://github.com/dart-lang/native/issues/2132): Change this to the // new value after it has rolled. - static const String typeForAssets = syntax.DataAsset.typeValue; + static const String typeForAssets = syntax.DataAssetNew.typeValue; } extension EncodedDataAsset on EncodedAsset { diff --git a/pkgs/native_assets_cli/pubspec.yaml b/pkgs/native_assets_cli/pubspec.yaml index 0b72e85d1c..fa84e9ca18 100644 --- a/pkgs/native_assets_cli/pubspec.yaml +++ b/pkgs/native_assets_cli/pubspec.yaml @@ -3,11 +3,9 @@ description: >- A library that contains the argument and file formats for implementing a native assets CLI. -version: 0.14.0 +version: 0.15.0-0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli -# publish_to: none - topics: - ffi - interop @@ -16,7 +14,7 @@ topics: resolution: workspace environment: - sdk: '>=3.7.0 <4.0.0' + sdk: '>=3.8.0-260.0.dev <4.0.0' dependencies: collection: ^1.19.1 diff --git a/pkgs/native_assets_cli/test/code_assets/code_asset_test.dart b/pkgs/native_assets_cli/test/code_assets/code_asset_test.dart index 279cb81aca..0287817ada 100644 --- a/pkgs/native_assets_cli/test/code_assets/code_asset_test.dart +++ b/pkgs/native_assets_cli/test/code_assets/code_asset_test.dart @@ -22,7 +22,7 @@ void main() async { 'id': 'package:my_package/name', 'link_mode': {'type': 'dynamic_loading_bundle'}, 'os': 'android', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'riscv64', 'file': 'not there', 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 1528ceb884..0bccf12c99 100644 --- a/pkgs/native_assets_cli/test/code_assets/config_test.dart +++ b/pkgs/native_assets_cli/test/code_assets/config_test.dart @@ -85,7 +85,7 @@ void main() async { 'id': 'package:my_package/name', 'link_mode': {'type': 'dynamic_loading_bundle'}, 'os': 'android', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'riscv64', 'file': 'not there', diff --git a/pkgs/native_assets_cli/test/data_assets/data_asset_test.dart b/pkgs/native_assets_cli/test/data_assets/data_asset_test.dart index 43d2d673f4..684ff3678b 100644 --- a/pkgs/native_assets_cli/test/data_assets/data_asset_test.dart +++ b/pkgs/native_assets_cli/test/data_assets/data_asset_test.dart @@ -17,7 +17,7 @@ void main() async { 'file': 'not there', 'package': 'my_package', 'name': 'name', - 'type': 'data', + 'type': 'data_assets/data', 'encoding': { 'file': 'not there', 'name': 'name', diff --git a/pkgs/native_assets_cli/test/model/asset_test.dart b/pkgs/native_assets_cli/test/model/asset_test.dart index e0b0b5af95..b4038b864e 100644 --- a/pkgs/native_assets_cli/test/model/asset_test.dart +++ b/pkgs/native_assets_cli/test/model/asset_test.dart @@ -77,7 +77,7 @@ void main() { 'id': 'package:my_package/foo', 'link_mode': {'type': 'dynamic_loading_bundle'}, 'os': 'android', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'x64', 'file': fooUri.toFilePath(), @@ -94,7 +94,7 @@ void main() { 'uri': foo3Uri.toFilePath(), }, 'os': 'android', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'x64', 'id': 'package:my_package/foo3', @@ -110,7 +110,7 @@ void main() { 'id': 'package:my_package/foo4', 'link_mode': {'type': 'dynamic_loading_executable'}, 'os': 'android', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'x64', 'id': 'package:my_package/foo4', @@ -123,7 +123,7 @@ void main() { 'id': 'package:my_package/foo5', 'link_mode': {'type': 'dynamic_loading_process'}, 'os': 'android', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'x64', 'id': 'package:my_package/foo5', @@ -137,7 +137,7 @@ void main() { 'id': 'package:my_package/bar', 'link_mode': {'type': 'static'}, 'os': 'linux', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'arm64', 'file': barUri.toFilePath(), @@ -152,7 +152,7 @@ void main() { 'id': 'package:my_package/bla', 'link_mode': {'type': 'dynamic_loading_bundle'}, 'os': 'windows', - 'type': 'native_code', + 'type': 'code_assets/code', 'encoding': { 'architecture': 'x64', 'file': blaUri.toFilePath(), @@ -165,7 +165,7 @@ void main() { 'name': 'my_data_asset', 'package': 'my_package', 'file': Uri.file('path/to/data.txt').toFilePath(), - 'type': 'data', + 'type': 'data_assets/data', 'encoding': { 'name': 'my_data_asset', 'package': 'my_package', @@ -176,7 +176,7 @@ void main() { 'name': 'my_data_asset2', 'package': 'my_package', 'file': Uri.file('path/to/data.json').toFilePath(), - 'type': 'data', + 'type': 'data_assets/data', 'encoding': { 'name': 'my_data_asset2', 'package': 'my_package', diff --git a/pkgs/native_toolchain_c/CHANGELOG.md b/pkgs/native_toolchain_c/CHANGELOG.md index dc1275c711..a65bb664a8 100644 --- a/pkgs/native_toolchain_c/CHANGELOG.md +++ b/pkgs/native_toolchain_c/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.12.0-wip + +- Bump `package:native_assets_cli` to 0.15.0. + ## 0.11.0 - Replace `linkInPackage` with `Routing`. diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml index 662edadd59..54f8636c12 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.11.0 +version: 0.12.0-wip repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c -# publish_to: none - topics: - compiler - ffi @@ -22,7 +20,7 @@ dependencies: glob: ^2.1.1 logging: ^1.3.0 meta: ^1.16.0 - native_assets_cli: ^0.14.0 + native_assets_cli: ^0.15.0-0 pub_semver: ^2.2.0 dev_dependencies: