diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index 7ce6790a5..8d966976c 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -33,7 +33,6 @@ jobs: os: [ubuntu, macos, windows] sdk: [stable, dev] package: [native_assets_builder, native_assets_cli, native_toolchain_c] - dependencies: [published, path] # 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] exclude: @@ -42,9 +41,6 @@ jobs: sdk: dev - os: windows sdk: dev - # Only run path deps on dev - - sdk: stable - dependencies: published runs-on: ${{ matrix.os }}-latest @@ -64,11 +60,6 @@ jobs: ndk-version: r26b if: ${{ matrix.sdk == 'stable' }} - - run: dart run ../../tools/check_pubspec_overrides.dart - - - run: dart run ../../tools/delete_pubspec_overrides.dart - if: ${{ matrix.dependencies == 'published' }} - - run: dart pub get - run: dart pub get -C test_data/dart_app/ @@ -133,11 +124,11 @@ jobs: - name: Install coverage run: dart pub global activate coverage - if: ${{ matrix.sdk == 'stable' && matrix.dependencies == 'published' }} + if: ${{ matrix.sdk == 'stable' }} - name: Collect coverage run: dart pub global run coverage:test_with_coverage - if: ${{ matrix.sdk == 'stable' && matrix.dependencies == 'published' }} + if: ${{ matrix.sdk == 'stable' }} - name: Upload coverage uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 @@ -145,7 +136,7 @@ jobs: flag-name: ${{ matrix.package }}_${{ matrix.os }} github-token: ${{ secrets.GITHUB_TOKEN }} parallel: true - if: ${{ matrix.sdk == 'stable' && matrix.dependencies == 'published' }} + if: ${{ matrix.sdk == 'stable' }} coverage-finished: needs: [build] diff --git a/pkgs/native_assets_builder/CHANGELOG.md b/pkgs/native_assets_builder/CHANGELOG.md index da64bdf9f..5c0c915aa 100644 --- a/pkgs/native_assets_builder/CHANGELOG.md +++ b/pkgs/native_assets_builder/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.3-wip + +- Bump `package:native_assets_cli` to path dependency. + ## 0.3.2 - Reintroduce `AssetRelativePath`, it's used in `dart build`. diff --git a/pkgs/native_assets_builder/CONTRIBUTING.md b/pkgs/native_assets_builder/CONTRIBUTING.md index 7bf301b26..29cf3ed51 100644 --- a/pkgs/native_assets_builder/CONTRIBUTING.md +++ b/pkgs/native_assets_builder/CONTRIBUTING.md @@ -9,38 +9,44 @@ Both Dartdev and Flutter Tools are built in open source, and inside g3. * Dartdev as part of the Dart SDK build on the [Dart CI]. * Dartdev as part of the g3 build (see CBuild comments on CLs on [Gerrit]). * Flutter Tools as part of the workflows on GitHub. -* Flutter Tools as part of the g3 build (see the "Google testing" workflow on PRs on GitHub). The versions used in these different places are as follows: * The Dart SDK uses pinned dependencies in [DEPS], the current hash is in `native_rev`. * The Flutter build on GitHub ussed published dependencies in [its `pubspec.yaml`]. -* The g3 build uses the pinned dependencies that are rolled in from the Dart SDK. **Both for Dartdev _and_ Flutter Tools**. ## Rolling The above means the following. -1. The DEPS in the Dart SDK can only be rolled forward as much as is still compatible with the published deps currently used in Flutter Tools. -2. Flutter Tools can only be rolled forward as much as is still compatible with with the deps pinned in the Dart SDK. - -So, any breaking change must be done in the following way: - -1. Introduce a new API. -2. Release a new version to pub (minor version). -3. Roll that version into Dart SDK, and migrate uses in the Dart SDK. -4. Wait for that Dart version to roll into g3. -5. Update the dependencies to Flutter Tools, and migrate uses. -6. Get the Flutter PR reviewed. -7. Wait for the Flutter PR to roll into g3. -8. Only then, remove the old API. -9. Release a new version to pub (major version, old API removed). -10. Roll both in to Dart/Flutter. +Breaking changes to `native_assets_cli`, `native_assets_builder`, and +`native_toolchain_c` have to be rolled into the Dart SDK with a CL that +runs all the `pkg` bots: +``` +Cq-Include-Trybots: luci.dart.try:pkg-win-release-try,pkg-win-release-arm64-try,pkg-mac-release-try,pkg-mac-release-arm64-try,pkg-linux-release-try,pkg-linux-release-arm64-try,pkg-linux-debug-try +``` +The CI on this repo runs with path dependencies between these packages +which corresponds to the path dependencies used in the DEPS file in the Dart +SDK. + +Breaking changes to `native_assets_cli` and `native_assets_builder` +have to be rolled into the packages/flutter_tools in the flutter/flutter repo. +This package uses published dependencies. +So this requires: + +1. Land a commit that sets the `native_assets_cli` to a stable version. +2. Publish `native_assets_cli` on pub.dev. +3. Land a commit that sets `native_assets_builder` to a stable version, + depends on the published version of `native_assets_cli`, and + removes the `publish_to: none`. +4. Publish `native_assets_builder` on pub.dev. +5. (Repeat these steps for `native_toolchain_c`.) +6. Finally, land a commit that sets all versions to WIP, and adds + `publish_to: none` back in. The roll status can be seen on internal corp links only: * Dart roll to g3: https://dart-in-g3-qa-prod.corp.google.com/dg3/Home#/cbuild -* Flutter roll to g3: https://frob.corp.google.com/ [`package:dartdev`]: https://github.com/dart-lang/sdk/tree/main/pkg/dartdev [`package:flutter_tools`]: https://github.com/flutter/flutter/tree/master/packages/flutter_tools diff --git a/pkgs/native_assets_builder/pubspec.yaml b/pkgs/native_assets_builder/pubspec.yaml index feadc61ed..e4fa2e12d 100644 --- a/pkgs/native_assets_builder/pubspec.yaml +++ b/pkgs/native_assets_builder/pubspec.yaml @@ -1,16 +1,20 @@ name: native_assets_builder description: >- This package is the backend that invokes top-level `build.dart` scripts. -version: 0.3.2 +version: 0.3.3-wip repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_builder environment: sdk: '>=3.0.0 <4.0.0' +publish_to: none + dependencies: graphs: ^2.3.1 logging: ^1.2.0 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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/pubspec_overrides.yaml b/pkgs/native_assets_builder/pubspec_overrides.yaml deleted file mode 100644 index 0c523c6f3..000000000 --- a/pkgs/native_assets_builder/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../native_assets_cli/ 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 e44b51afa..319274790 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 @@ -11,7 +11,9 @@ dependencies: cli_config: ^0.1.1 cyclic_package_2: path: ../cyclic_package_2 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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_1/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ 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 73b91d987..a534f6628 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 @@ -11,7 +11,9 @@ dependencies: cli_config: ^0.1.1 cyclic_package_1: path: ../cyclic_package_1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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_overrides.yaml b/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ diff --git a/pkgs/native_assets_builder/test_data/dart_app/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/dart_app/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_builder/test_data/dart_app/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - native_toolchain_c: - path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_builder/test_data/manifest.yaml b/pkgs/native_assets_builder/test_data/manifest.yaml index 0cf24a3bd..04649be33 100644 --- a/pkgs/native_assets_builder/test_data/manifest.yaml +++ b/pkgs/native_assets_builder/test_data/manifest.yaml @@ -2,20 +2,16 @@ # a completely clean setup. - cyclic_package_1/build.dart - cyclic_package_1/pubspec.yaml -- cyclic_package_1/pubspec_overrides.yaml - cyclic_package_2/build.dart - cyclic_package_2/pubspec.yaml -- cyclic_package_2/pubspec_overrides.yaml - dart_app/bin/dart_app.dart - dart_app/pubspec.yaml -- dart_app/pubspec_overrides.yaml - native_add/build.dart - native_add/ffigen.yaml - native_add/lib/native_add.dart - native_add/lib/src/native_add_bindings_generated.dart - native_add/lib/src/native_add.dart - native_add/pubspec.yaml -- native_add/pubspec_overrides.yaml - native_add/src/native_add.c - native_add/src/native_add.h - native_add/test/native_add_test.dart @@ -25,26 +21,19 @@ - native_subtract/lib/src/native_subtract_bindings_generated.dart - native_subtract/lib/src/native_subtract.dart - native_subtract/pubspec.yaml -- native_subtract/pubspec_overrides.yaml - native_subtract/src/native_subtract.c - native_subtract/src/native_subtract.h - package_reading_metadata/build.dart - package_reading_metadata/pubspec.yaml -- package_reading_metadata/pubspec_overrides.yaml - package_with_metadata/build.dart - package_with_metadata/pubspec.yaml -- package_with_metadata/pubspec_overrides.yaml - some_dev_dep/bin/some_dev_dep.dart - some_dev_dep/pubspec.yaml - wrong_build_output/build.dart - wrong_build_output/pubspec.yaml -- wrong_build_output/pubspec_overrides.yaml - wrong_build_output_2/build.dart - wrong_build_output_2/pubspec.yaml -- wrong_build_output_2/pubspec_overrides.yaml - wrong_build_output_3/build.dart - wrong_build_output_3/pubspec.yaml -- wrong_build_output_3/pubspec_overrides.yaml - wrong_namespace_asset/build.dart - wrong_namespace_asset/pubspec.yaml -- wrong_namespace_asset/pubspec_overrides.yaml diff --git a/pkgs/native_assets_builder/test_data/native_add/manifest.yaml b/pkgs/native_assets_builder/test_data/native_add/manifest.yaml index 8360a6bd6..e922db8c1 100644 --- a/pkgs/native_assets_builder/test_data/native_add/manifest.yaml +++ b/pkgs/native_assets_builder/test_data/native_add/manifest.yaml @@ -4,7 +4,6 @@ - lib/src/native_add_bindings_generated.dart - lib/src/native_add.dart - pubspec.yaml -- pubspec_overrides.yaml - src/native_add.c - src/native_add.h - test/native_add_test.dart 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 e80458312..55a46e023 100644 --- a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml @@ -10,8 +10,12 @@ environment: dependencies: cli_config: ^0.1.1 logging: ^1.1.1 - native_assets_cli: ^0.4.1 - native_toolchain_c: ^0.3.4+1 + # native_assets_cli: ^0.4.1 + native_assets_cli: + path: ../../../native_assets_cli/ + # native_toolchain_c: ^0.3.4+1 + native_toolchain_c: + path: ../../../native_toolchain_c/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_builder/test_data/native_add/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/native_add/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_builder/test_data/native_add/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - 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 ff3884708..0b86c97d0 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 @@ -10,8 +10,12 @@ environment: dependencies: cli_config: ^0.1.1 logging: ^1.1.1 - native_assets_cli: ^0.4.1 - native_toolchain_c: ^0.3.4+1 + # native_assets_cli: ^0.4.1 + native_assets_cli: + path: ../../../native_assets_cli/ + # native_toolchain_c: ^0.3.4+1 + native_toolchain_c: + path: ../../../native_toolchain_c/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - 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 12653f5af..8dadbd480 100644 --- a/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml @@ -10,8 +10,12 @@ environment: dependencies: cli_config: ^0.1.1 logging: ^1.1.1 - native_assets_cli: ^0.4.1 - native_toolchain_c: ^0.3.4+1 + # native_assets_cli: ^0.4.1 + native_assets_cli: + path: ../../../native_assets_cli/ + # native_toolchain_c: ^0.3.4+1 + native_toolchain_c: + path: ../../../native_toolchain_c/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_builder/test_data/native_subtract/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/native_subtract/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_builder/test_data/native_subtract/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - native_toolchain_c: - path: ../../../native_toolchain_c/ 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 48af4a601..b205c5056 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 @@ -9,7 +9,9 @@ environment: dependencies: cli_config: ^0.1.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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_reading_metadata/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ 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 c3fd7f3ec..22f861697 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 @@ -9,7 +9,9 @@ environment: dependencies: cli_config: ^0.1.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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/package_with_metadata/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/package_with_metadata/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/package_with_metadata/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ diff --git a/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ 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 9eb0bb167..795da6c6f 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 @@ -9,7 +9,9 @@ environment: dependencies: cli_config: ^0.1.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ 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 f3e85d6ba..2cf183d00 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 @@ -9,7 +9,9 @@ environment: dependencies: cli_config: ^0.1.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ 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 407a11215..c455227a3 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 @@ -9,7 +9,9 @@ environment: dependencies: cli_config: ^0.1.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ 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 793f3afb1..6c45e581f 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 @@ -9,7 +9,9 @@ environment: dependencies: cli_config: ^0.1.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + 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_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec_overrides.yaml deleted file mode 100644 index efe1074b5..000000000 --- a/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ diff --git a/pkgs/native_assets_cli/CHANGELOG.md b/pkgs/native_assets_cli/CHANGELOG.md index 490791efd..1af5e33cd 100644 --- a/pkgs/native_assets_cli/CHANGELOG.md +++ b/pkgs/native_assets_cli/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.3-wip + +- Bump examples dependencies to path dependencies. + ## 0.4.2 - Fix dartdoc generation. Hide the implementation details. diff --git a/pkgs/native_assets_cli/example/native_add_app/pubspec_overrides.yaml b/pkgs/native_assets_cli/example/native_add_app/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_cli/example/native_add_app/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - native_toolchain_c: - path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_cli/example/native_add_library/pubspec.yaml b/pkgs/native_assets_cli/example/native_add_library/pubspec.yaml index ff833bacd..eb7c68453 100644 --- a/pkgs/native_assets_cli/example/native_add_library/pubspec.yaml +++ b/pkgs/native_assets_cli/example/native_add_library/pubspec.yaml @@ -11,8 +11,12 @@ environment: dependencies: cli_config: ^0.1.1 logging: ^1.1.1 - native_assets_cli: ^0.4.1 - native_toolchain_c: ^0.3.4+1 + # native_assets_cli: ^0.4.1 + native_assets_cli: + path: ../../../native_assets_cli/ + # native_toolchain_c: ^0.3.4+1 + native_toolchain_c: + path: ../../../native_toolchain_c/ dev_dependencies: ffigen: ^8.0.2 diff --git a/pkgs/native_assets_cli/example/native_add_library/pubspec_overrides.yaml b/pkgs/native_assets_cli/example/native_add_library/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_cli/example/native_add_library/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - native_toolchain_c: - path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_cli/example/use_dart_api/manifest.yaml b/pkgs/native_assets_cli/example/use_dart_api/manifest.yaml index 8360a6bd6..e922db8c1 100644 --- a/pkgs/native_assets_cli/example/use_dart_api/manifest.yaml +++ b/pkgs/native_assets_cli/example/use_dart_api/manifest.yaml @@ -4,7 +4,6 @@ - lib/src/native_add_bindings_generated.dart - lib/src/native_add.dart - pubspec.yaml -- pubspec_overrides.yaml - src/native_add.c - src/native_add.h - test/native_add_test.dart diff --git a/pkgs/native_assets_cli/example/use_dart_api/pubspec.yaml b/pkgs/native_assets_cli/example/use_dart_api/pubspec.yaml index 191f413aa..3095569a5 100644 --- a/pkgs/native_assets_cli/example/use_dart_api/pubspec.yaml +++ b/pkgs/native_assets_cli/example/use_dart_api/pubspec.yaml @@ -10,8 +10,12 @@ environment: dependencies: cli_config: ^0.1.1 logging: ^1.1.1 - native_assets_cli: ^0.4.1 - native_toolchain_c: ^0.3.4+1 + # native_assets_cli: ^0.4.1 + native_assets_cli: + path: ../../../native_assets_cli/ + # native_toolchain_c: ^0.3.4+1 + native_toolchain_c: + path: ../../../native_toolchain_c/ dev_dependencies: ffigen: ^10.0.0 diff --git a/pkgs/native_assets_cli/example/use_dart_api/pubspec_overrides.yaml b/pkgs/native_assets_cli/example/use_dart_api/pubspec_overrides.yaml deleted file mode 100644 index 272d61ecc..000000000 --- a/pkgs/native_assets_cli/example/use_dart_api/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../../../native_assets_cli/ - native_toolchain_c: - path: ../../../native_toolchain_c/ diff --git a/pkgs/native_assets_cli/pubspec.yaml b/pkgs/native_assets_cli/pubspec.yaml index ed64cbfe2..42fe30873 100644 --- a/pkgs/native_assets_cli/pubspec.yaml +++ b/pkgs/native_assets_cli/pubspec.yaml @@ -4,7 +4,7 @@ description: >- native assets CLI. # Note: Bump BuildConfig.version and BuildOutput.version on breaking changes! -version: 0.4.2 +version: 0.4.3-wip repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli topics: diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml index 8588944c6..99b4101f2 100644 --- a/pkgs/native_toolchain_c/pubspec.yaml +++ b/pkgs/native_toolchain_c/pubspec.yaml @@ -14,12 +14,16 @@ topics: environment: sdk: '>=3.1.0 <4.0.0' +publish_to: none + dependencies: cli_config: ^0.1.1 glob: ^2.1.1 logging: ^1.1.1 meta: ^1.9.1 - native_assets_cli: ^0.4.1 + # native_assets_cli: ^0.4.1 + native_assets_cli: + path: ../native_assets_cli/ pub_semver: ^2.1.3 dev_dependencies: diff --git a/pkgs/native_toolchain_c/pubspec_overrides.yaml b/pkgs/native_toolchain_c/pubspec_overrides.yaml deleted file mode 100644 index 0c523c6f3..000000000 --- a/pkgs/native_toolchain_c/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - native_assets_cli: - path: ../native_assets_cli/ diff --git a/tools/check_pubspec_overrides.dart b/tools/check_pubspec_overrides.dart deleted file mode 100644 index a519047bb..000000000 --- a/tools/check_pubspec_overrides.dart +++ /dev/null @@ -1,26 +0,0 @@ -import 'dart:io'; - -void main(List arguments) async { - final allPubspecs = await Directory.current - .list(recursive: true) - .where((f) => f.path.endsWith('pubspec.yaml')) - .map((f) => f as File) - .toList(); - final nativePubspecs = - allPubspecs.where((f) => f.path.contains('pkgs/native_')).toList(); - final missingOverrides = nativePubspecs - .map((element) => - File.fromUri(element.uri.resolve('pubspec_overrides.yaml'))) - .where((f) => !f.existsSync()) - .where((f) => - !f.path.endsWith('pkgs/native_assets_cli/pubspec_overrides.yaml')) - .toList() - .join('\n'); - if (missingOverrides.isEmpty) { - print('No missing overrides.'); - } else { - print('Missing overrides:'); - print(missingOverrides); - exit(1); - } -} diff --git a/tools/delete_pubspec_overrides.dart b/tools/delete_pubspec_overrides.dart deleted file mode 100644 index 5ae2ff795..000000000 --- a/tools/delete_pubspec_overrides.dart +++ /dev/null @@ -1,6 +0,0 @@ -import 'dart:io'; - -void main(List arguments) => Directory.current - .list(recursive: true) - .where((f) => f.path.endsWith('pubspec_overrides.yaml')) - .forEach((f) => f.deleteSync());