diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index eae9ffa06..967159bd7 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -57,104 +57,12 @@ jobs: - run: dart pub get - - run: dart pub get -C test_data/dart_app/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/native_add/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/native_add_duplicate/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/native_add_add_source/ - if: ${{ matrix.package == 'native_assets_builder' }} - - run: dart pub get -C test_data/native_add_version_skew/ if: ${{ matrix.package == 'native_assets_builder' }} - run: dart pub get -C test_data/native_add_version_skew_2/ if: ${{ matrix.package == 'native_assets_builder' }} - - run: dart pub get -C test_data/native_subtract/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/package_reading_metadata/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/package_with_metadata/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/simple_link/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/complex_link/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/complex_link_helper/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/drop_dylib_link/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/add_asset_link/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/transformer/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/treeshaking_native_libs/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/native_dynamic_linking/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/reusable_dynamic_library/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/reuse_dynamic_library/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/user_defines/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/no_hook/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C example/build/download_asset/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/build/native_dynamic_linking/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/build/native_add_app/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/build/native_add_library/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/build/use_dart_api/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/build/system_library/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/link/package_with_assets/ - if: ${{ matrix.package == 'native_assets_cli' }} - - - run: dart pub get -C example/link/app_with_asset_treeshaking/ - if: ${{ matrix.package == 'native_assets_cli' }} - - run: dart pub get -C test_data/fail_build/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/depend_on_fail_build/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/depend_on_fail_build_app/ - if: ${{ matrix.package == 'native_assets_builder' }} - - - run: dart pub get -C test_data/system_library/ - if: ${{ matrix.package == 'native_assets_builder' }} - - run: dart analyze --fatal-infos # Run on dev to ensure we're not depending on deprecated SDK things. @@ -166,16 +74,18 @@ jobs: - run: dart test - - run: dart --enable-experiment=native-assets test - working-directory: pkgs/${{ matrix.package }}/example/build/native_dynamic_linking/ - # TODO(https://github.com/dart-lang/native/issues/190): Enable on windows once - # https://github.com/dart-lang/sdk/commit/903eea6bfb8ee405587f0866a1d1e92eea45d29e - # has landed in dev channel. - if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change && matrix.os != 'windows' }} + # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces + # - run: dart --enable-experiment=native-assets test + # working-directory: pkgs/${{ matrix.package }}/example/build/native_dynamic_linking/ + # # TODO(https://github.com/dart-lang/native/issues/190): Enable on windows once + # # https://github.com/dart-lang/sdk/commit/903eea6bfb8ee405587f0866a1d1e92eea45d29e + # # has landed in dev channel. + # if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change && matrix.os != 'windows' }} - - run: dart --enable-experiment=native-assets test - working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/ - if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} + # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces + # - run: dart --enable-experiment=native-assets test + # working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/ + # if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} - run: dart --enable-experiment=native-assets run working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/ @@ -189,17 +99,20 @@ jobs: working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/bin/native_add_app/ if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} - - run: dart --enable-experiment=native-assets test - working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/ - if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} + # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces + # - run: dart --enable-experiment=native-assets test + # working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/ + # if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} - - run: dart --enable-experiment=native-assets test - working-directory: pkgs/${{ matrix.package }}/example/build/download_asset/ - if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} - - - run: dart --enable-experiment=native-assets test - working-directory: pkgs/${{ matrix.package }}/example/build/system_library/ - if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} + # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces + # - run: dart --enable-experiment=native-assets test + # working-directory: pkgs/${{ matrix.package }}/example/build/download_asset/ + # if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} + + # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces + # - run: dart --enable-experiment=native-assets test + # working-directory: pkgs/${{ matrix.package }}/example/build/system_library/ + # if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }} - name: Install coverage run: dart pub global activate coverage diff --git a/pkgs/code_assets/pubspec.yaml b/pkgs/code_assets/pubspec.yaml index f4a6b5a69..6ac4eb7ee 100644 --- a/pkgs/code_assets/pubspec.yaml +++ b/pkgs/code_assets/pubspec.yaml @@ -8,6 +8,8 @@ description: >- publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/data_assets/pubspec.yaml b/pkgs/data_assets/pubspec.yaml index cfac87cb3..1f67e92a0 100644 --- a/pkgs/data_assets/pubspec.yaml +++ b/pkgs/data_assets/pubspec.yaml @@ -8,6 +8,8 @@ description: >- publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/hooks/pubspec.yaml b/pkgs/hooks/pubspec.yaml index eb6b3ab0e..6b3d00f76 100644 --- a/pkgs/hooks/pubspec.yaml +++ b/pkgs/hooks/pubspec.yaml @@ -4,6 +4,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/hooks publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/json_syntax_generator/pubspec.yaml b/pkgs/json_syntax_generator/pubspec.yaml index 6db2e3cf7..e7ef41dbf 100644 --- a/pkgs/json_syntax_generator/pubspec.yaml +++ b/pkgs/json_syntax_generator/pubspec.yaml @@ -9,6 +9,8 @@ description: | publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_builder/pubspec.yaml b/pkgs/native_assets_builder/pubspec.yaml index a6b3b912f..30dcdf567 100644 --- a/pkgs/native_assets_builder/pubspec.yaml +++ b/pkgs/native_assets_builder/pubspec.yaml @@ -6,6 +6,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_bui publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_builder/test/helpers.dart b/pkgs/native_assets_builder/test/helpers.dart index cdaaa1739..5c8e9d442 100644 --- a/pkgs/native_assets_builder/test/helpers.dart +++ b/pkgs/native_assets_builder/test/helpers.dart @@ -278,10 +278,12 @@ Future copyTestProjects({Uri? sourceUri, required Uri targetUri}) async { final sourceFile = File.fromUri(sourceUri.resolveUri(pathToModify)); final targetFileUri = targetUri.resolveUri(pathToModify); final sourceString = await sourceFile.readAsString(); - final modifiedString = sourceString.replaceAll( - 'path: ../../', - 'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}', - ); + final modifiedString = sourceString + .replaceAll( + 'path: ../../', + 'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}', + ) + .replaceAll('resolution: workspace', ''); await File.fromUri( targetFileUri, ).writeAsString(modifiedString, flush: true); 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 270c43205..956d7e284 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 9e91a682d..a6d345a56 100644 --- a/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 be165ecfe..9e82b9473 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 f20a07178..a825c2e45 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 62786dbeb..5ee7d7021 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_builder/test_data/dart_app/pubspec.yaml b/pkgs/native_assets_builder/test_data/dart_app/pubspec.yaml index 195361396..cce118424 100644 --- a/pkgs/native_assets_builder/test_data/dart_app/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/dart_app/pubspec.yaml @@ -2,6 +2,8 @@ name: dart_app publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 be9d96d37..c7c2edbc5 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 4254e8cb7..e9b95a543 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 f55c97b92..439c5a0d7 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 da46d163c..b5dbdbddb 100644 --- a/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 5aec9ec0f..5c7aed259 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 92b7caef8..0094dcd0d 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 0fafac474..6e6d037f4 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_builder/test_data/manifest_generator.dart b/pkgs/native_assets_builder/test_data/manifest_generator.dart index f628d76ae..4022f1984 100644 --- a/pkgs/native_assets_builder/test_data/manifest_generator.dart +++ b/pkgs/native_assets_builder/test_data/manifest_generator.dart @@ -20,6 +20,10 @@ const denyList = [ ]; /// These just modify other test projects. +/// +/// Don't add pubspecs to manifests, they contain a different name due to all +/// being part of a big workspace. They have a pubspec to enable analysis of +/// the Dart code in them. const partialProjects = [ 'native_add_add_source', 'native_add_add_symbol', @@ -42,9 +46,13 @@ void updateManifest(Directory directory, bool allowPartialProjects) { for (final denyString in [ ...denyList, if (!allowPartialProjects) ...partialProjects, + for (final partialProject in partialProjects) ...[ + '$partialProject/pubspec.yaml', + ], ]) { if (f.path.contains(denyString)) return false; } + return true; }) .map((e) => e.path.replaceFirst(dirPath, '')) 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 3d961a3bd..5fcb3fc5e 100644 --- a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_builder/test_data/native_add_add_source/manifest.yaml b/pkgs/native_assets_builder/test_data/native_add_add_source/manifest.yaml index 367e8f39a..0c6a8b7ce 100644 --- a/pkgs/native_assets_builder/test_data/native_add_add_source/manifest.yaml +++ b/pkgs/native_assets_builder/test_data/native_add_add_source/manifest.yaml @@ -2,6 +2,5 @@ # a completely clean setup. # Automatically generated by manifest_generator.dart. - hook/build.dart -- pubspec.yaml - src/native_multiply.c - src/native_multiply.h 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 3d961a3bd..a5593d992 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 @@ -1,9 +1,11 @@ -name: native_add +name: native_add_source description: Sums two numbers with native code. version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 60a7366c9..b8184dcef 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 fd5a4ac52..5f8c7f384 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 @@ -5,6 +5,8 @@ description: Dynamically link native libraries to each other. version: 0.1.0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_dynamic_linking +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 07b762725..0bebe0dc9 100644 --- a/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 907940a54..428f4b61d 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 1a031d261..6f7721d9a 100644 --- a/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 2154d5a6b..31eaf99e3 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 4616822fd..53342a516 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 efa6ad1a6..5819c9310 100644 --- a/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 bdf49b90b..173fdbe62 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 @@ -6,6 +6,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 90cc27a44..992a5f862 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 @@ -5,6 +5,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 3669421b6..3a2eee949 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 bd1ead092..2508ca2f9 100644 --- a/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec.yaml b/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec.yaml index 8cc6efed5..8f1d174dd 100644 --- a/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec.yaml @@ -4,5 +4,7 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 7ace3e442..0d0de9193 100644 --- a/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 f0c530ea1..bc7b0bb22 100644 --- a/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 99fc46059..a020d828a 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 87a05ea1c..185443c8f 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 @@ -5,6 +5,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 749e98d4d..044b9bc2e 100644 --- a/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 00d9385cd..63bb64ed3 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 dadcf6853..4f6c57538 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 4f355924c..cb229d365 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 932fd5e1e..f3f77d3b5 100644 --- a/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 75f0e8945..8c92c5093 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' 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 cfee15dea..0acc03968 100644 --- a/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml @@ -5,6 +5,8 @@ description: Sums two numbers with native code, prebuilt assets. version: 0.1.0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/download_asset +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.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 36c7ab58f..c1d5c1a7c 100644 --- a/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml @@ -5,6 +5,8 @@ description: Uses an asset local to the package. version: 0.1.0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_add_library +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_cli/example/build/native_add_app/pubspec.yaml b/pkgs/native_assets_cli/example/build/native_add_app/pubspec.yaml index daaf779c0..1660d4bca 100644 --- a/pkgs/native_assets_cli/example/build/native_add_app/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/native_add_app/pubspec.yaml @@ -5,6 +5,8 @@ description: Invokes a package with native assets. version: 0.1.0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_add_app +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 fb7b18ed5..467ba6315 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 @@ -5,6 +5,8 @@ description: Sums two numbers with native code. version: 0.1.0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_add_library +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 663213548..c56bae91b 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 @@ -1,10 +1,12 @@ publish_to: none -name: native_dynamic_linking +name: native_dynamic_linking_example description: Dynamically link native libraries to each other. version: 0.1.0 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_dynamic_linking +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_cli/example/build/native_dynamic_linking/test/add_test.dart b/pkgs/native_assets_cli/example/build/native_dynamic_linking/test/add_test.dart index 906e3a8f2..0702154b9 100644 --- a/pkgs/native_assets_cli/example/build/native_dynamic_linking/test/add_test.dart +++ b/pkgs/native_assets_cli/example/build/native_dynamic_linking/test/add_test.dart @@ -2,7 +2,7 @@ // 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 'package:native_dynamic_linking/add.dart'; +import 'package:native_dynamic_linking_example/add.dart'; import 'package:test/test.dart'; void main() { 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 d319d21c7..5e7d550c6 100644 --- a/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml @@ -1,9 +1,11 @@ -name: system_library +name: system_library_example description: Uses some functions from system lirbaries. version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_cli/example/build/system_library/test/memory_test.dart b/pkgs/native_assets_cli/example/build/system_library/test/memory_test.dart index 988cf7a60..ba282b724 100644 --- a/pkgs/native_assets_cli/example/build/system_library/test/memory_test.dart +++ b/pkgs/native_assets_cli/example/build/system_library/test/memory_test.dart @@ -5,7 +5,7 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:system_library/memory.dart'; +import 'package:system_library_example/memory.dart'; import 'package:test/test.dart'; void main() { 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 c25483822..0155c20cb 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_cli/example/link/app_with_asset_treeshaking/pubspec.yaml b/pkgs/native_assets_cli/example/link/app_with_asset_treeshaking/pubspec.yaml index 00b137a7e..f1d052428 100644 --- a/pkgs/native_assets_cli/example/link/app_with_asset_treeshaking/pubspec.yaml +++ b/pkgs/native_assets_cli/example/link/app_with_asset_treeshaking/pubspec.yaml @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.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 4edb479a8..e4d5745dd 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 @@ -4,6 +4,8 @@ version: 0.1.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_assets_cli/pubspec.yaml b/pkgs/native_assets_cli/pubspec.yaml index 200eb7916..bb233d8f0 100644 --- a/pkgs/native_assets_cli/pubspec.yaml +++ b/pkgs/native_assets_cli/pubspec.yaml @@ -13,6 +13,8 @@ topics: - interop - native-assets +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml index 5148fd09d..7a23d9e97 100644 --- a/pkgs/native_toolchain_c/pubspec.yaml +++ b/pkgs/native_toolchain_c/pubspec.yaml @@ -13,6 +13,8 @@ topics: - native-assets - native-toolchain +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 000000000..241456017 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,60 @@ +name: dart_lang_native_workspace + +environment: + sdk: '>=3.7.0 <4.0.0' + +workspace: + - pkgs/code_assets + - pkgs/data_assets + - pkgs/hooks + - pkgs/json_syntax_generator + - pkgs/native_assets_builder + - pkgs/native_assets_builder/test_data/add_asset_link + - pkgs/native_assets_builder/test_data/complex_link + - pkgs/native_assets_builder/test_data/complex_link_helper + - pkgs/native_assets_builder/test_data/cyclic_package_1 + - pkgs/native_assets_builder/test_data/cyclic_package_2 + - pkgs/native_assets_builder/test_data/dart_app + - pkgs/native_assets_builder/test_data/depend_on_fail_build + - pkgs/native_assets_builder/test_data/depend_on_fail_build_app + - pkgs/native_assets_builder/test_data/drop_dylib_link + - pkgs/native_assets_builder/test_data/fail_build + - pkgs/native_assets_builder/test_data/fail_on_os_sdk_version + - pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link + - pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker + - pkgs/native_assets_builder/test_data/native_add + - pkgs/native_assets_builder/test_data/native_add_add_source + - pkgs/native_assets_builder/test_data/native_add_duplicate + - pkgs/native_assets_builder/test_data/native_dynamic_linking + - pkgs/native_assets_builder/test_data/native_subtract + - pkgs/native_assets_builder/test_data/no_asset_for_link + - pkgs/native_assets_builder/test_data/no_hook + - pkgs/native_assets_builder/test_data/package_reading_metadata + - pkgs/native_assets_builder/test_data/package_with_metadata + - pkgs/native_assets_builder/test_data/relative_path + - pkgs/native_assets_builder/test_data/reusable_dynamic_library + - pkgs/native_assets_builder/test_data/reuse_dynamic_library + - pkgs/native_assets_builder/test_data/simple_data_asset + - pkgs/native_assets_builder/test_data/simple_link + - pkgs/native_assets_builder/test_data/some_dev_dep + - pkgs/native_assets_builder/test_data/system_library + - pkgs/native_assets_builder/test_data/transformer + - pkgs/native_assets_builder/test_data/treeshaking_native_libs + - pkgs/native_assets_builder/test_data/use_all_api + - pkgs/native_assets_builder/test_data/user_defines + - pkgs/native_assets_builder/test_data/wrong_build_output + - pkgs/native_assets_builder/test_data/wrong_build_output_2 + - pkgs/native_assets_builder/test_data/wrong_build_output_3 + - pkgs/native_assets_builder/test_data/wrong_linker + - pkgs/native_assets_builder/test_data/wrong_namespace_asset + - pkgs/native_assets_cli + - pkgs/native_assets_cli/example/build/download_asset + - pkgs/native_assets_cli/example/build/local_asset + - pkgs/native_assets_cli/example/build/native_add_app + - pkgs/native_assets_cli/example/build/native_add_library + - pkgs/native_assets_cli/example/build/native_dynamic_linking + - pkgs/native_assets_cli/example/build/system_library + - pkgs/native_assets_cli/example/build/use_dart_api + - pkgs/native_assets_cli/example/link/app_with_asset_treeshaking + - pkgs/native_assets_cli/example/link/package_with_assets + - pkgs/native_toolchain_c