diff --git a/pkgs/native_assets_builder/pubspec.yaml b/pkgs/native_assets_builder/pubspec.yaml index 30dcdf567..01797f613 100644 --- a/pkgs/native_assets_builder/pubspec.yaml +++ b/pkgs/native_assets_builder/pubspec.yaml @@ -18,9 +18,7 @@ dependencies: graphs: ^2.3.2 logging: ^1.3.0 meta: ^1.16.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../native_assets_cli/ + native_assets_cli: ^0.14.0-wip package_config: ^2.1.0 pub_semver: ^2.2.0 yaml: ^3.1.3 diff --git a/pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart b/pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart index 0e2ab1c7a..8c8ba3f7e 100644 --- a/pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart +++ b/pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart @@ -15,7 +15,7 @@ void main() async { late Uri tempUri; setUp(() async { tempUri = await tempDirForTest(); - await copyTestProjects(targetUri: tempUri); + await copyTestProjects(targetUri: tempUri, addDependencyOverrides: false); }); Future makePubWorkspace(List packages) async { @@ -44,6 +44,20 @@ workspace: - $package/ '''; } + workspacePubSpec += ''' + +dependency_overrides: +'''; + const packagesToOverride = ['native_assets_cli', 'native_toolchain_c']; + for (final package in packagesToOverride) { + workspacePubSpec += ''' + $package: + path: ${pkgNativeAssetsBuilderUri.resolve('../$package/').toFilePath()} +'''; + } + + printOnFailure(workspacePubSpecUri.toString()); + printOnFailure(workspacePubSpec); await File.fromUri(workspacePubSpecUri).writeAsString(workspacePubSpec); await runPubGet(workingDirectory: tempUri, logger: logger); diff --git a/pkgs/native_assets_builder/test/helpers.dart b/pkgs/native_assets_builder/test/helpers.dart index 5c8e9d442..508485458 100644 --- a/pkgs/native_assets_builder/test/helpers.dart +++ b/pkgs/native_assets_builder/test/helpers.dart @@ -232,7 +232,11 @@ extension AssetIterable on Iterable { } } -Future copyTestProjects({Uri? sourceUri, required Uri targetUri}) async { +Future copyTestProjects({ + Uri? sourceUri, + required Uri targetUri, + bool addDependencyOverrides = true, +}) async { sourceUri ??= testDataUri; final manifestUri = sourceUri.resolve('manifest.yaml'); final manifestFile = File.fromUri(manifestUri); @@ -277,13 +281,23 @@ Future copyTestProjects({Uri? sourceUri, required Uri targetUri}) async { for (final pathToModify in filesToModify) { 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()}', - ) - .replaceAll('resolution: workspace', ''); + var sourceString = await sourceFile.readAsString(); + if (addDependencyOverrides && + !pathToModify.path.contains('native_add_version_skew')) { + sourceString += ''' + +dependency_overrides: +'''; + const packagesToOverride = ['native_assets_cli', 'native_toolchain_c']; + for (final package in packagesToOverride) { + sourceString += ''' + $package: + path: ${pkgNativeAssetsBuilderUri.resolve('../$package/').toFilePath()} +'''; + } + } + + final modifiedString = sourceString.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 956d7e284..796bd8093 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,12 +12,8 @@ environment: dependencies: logging: ^1.3.0 meta: ^1.16.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 a6d345a56..ce7c7ee47 100644 --- a/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml @@ -14,9 +14,7 @@ dependencies: complex_link_helper: path: ../complex_link_helper/ logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 9e82b9473..18606f641 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,9 +12,7 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 a825c2e45..9f1404f80 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,9 +12,7 @@ environment: dependencies: cyclic_package_2: path: ../cyclic_package_2 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 5ee7d7021..557b748d9 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,9 +12,7 @@ environment: dependencies: cyclic_package_1: path: ../cyclic_package_1 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 c7c2edbc5..466f18a00 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,9 +12,7 @@ environment: dependencies: fail_build: path: ../fail_build/ - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 e9b95a543..5038f4404 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,9 +12,7 @@ environment: dependencies: depend_on_fail_build: path: ../depend_on_fail_build/ - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 439c5a0d7..49012507d 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,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 b5dbdbddb..4be0c4afb 100644 --- a/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml @@ -10,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 5c7aed259..e3967d5e5 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 0094dcd0d..4ae0ad7e8 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,9 +12,7 @@ environment: dependencies: fail_on_os_sdk_version_linker: path: ../fail_on_os_sdk_version_linker/ - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 6e6d037f4..173f5fc20 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 5fcb3fc5e..ad137a4b5 100644 --- a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml @@ -11,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 a5593d992..6fee097f6 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,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 b8184dcef..421fbeb9e 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,12 +13,8 @@ dependencies: logging: ^1.3.0 native_add: path: ../native_add/ - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 5f8c7f384..86fbde339 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,12 +12,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 0bebe0dc9..31f69d9fa 100644 --- a/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml @@ -11,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 428f4b61d..ec96568c4 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,9 +12,7 @@ environment: dependencies: logging: ^1.3.0 meta: ^1.16.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 6f7721d9a..ac5fa3143 100644 --- a/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml @@ -11,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 31eaf99e3..b70220b88 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 53342a516..953e675d2 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 5819c9310..dc33b7b08 100644 --- a/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml @@ -11,9 +11,7 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 173fdbe62..48e5b0f6e 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,12 +13,8 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 992a5f862..d3ffab41c 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,12 +12,8 @@ environment: dependencies: logging: ^1.1.1 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 3a2eee949..323a0c2fe 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,9 +11,7 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 2508ca2f9..c84f049e6 100644 --- a/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml @@ -12,9 +12,7 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 0d0de9193..dc3e16060 100644 --- a/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/system_library/pubspec.yaml @@ -11,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 bc7b0bb22..db99c3050 100644 --- a/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/transformer/pubspec.yaml @@ -11,9 +11,7 @@ environment: dependencies: crypto: ^3.0.6 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 a020d828a..c4d265815 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,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 185443c8f..d8acdc090 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,9 +13,7 @@ environment: dependencies: cli_config: ^0.2.0 logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 044b9bc2e..5717c8c03 100644 --- a/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml @@ -10,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 63bb64ed3..ec7fff7e2 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 4f6c57538..e68d60d84 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 cb229d365..f82b3ba67 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 f3f77d3b5..88486ab43 100644 --- a/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml +++ b/pkgs/native_assets_builder/test_data/wrong_linker/pubspec.yaml @@ -10,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 8c92c5093..eb89f8d4e 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,9 +10,7 @@ environment: sdk: '>=3.7.0 <4.0.0' dependencies: - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip dev_dependencies: lints: ^5.1.1 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 0acc03968..aedf014b5 100644 --- a/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml @@ -13,12 +13,8 @@ environment: dependencies: crypto: ^3.0.6 logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 c1d5c1a7c..2ad15999c 100644 --- a/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml @@ -12,9 +12,7 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip 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 467ba6315..774f10047 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,12 +12,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 c56bae91b..d83bc7bda 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,12 +12,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 5e7d550c6..50107449f 100644 --- a/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml +++ b/pkgs/native_assets_cli/example/build/system_library/pubspec.yaml @@ -11,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 0155c20cb..523d303e2 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,12 +11,8 @@ environment: dependencies: logging: ^1.3.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ - # native_toolchain_c: ^0.10.0 - native_toolchain_c: - path: ../../../../native_toolchain_c/ + native_assets_cli: ^0.14.0-wip + native_toolchain_c: ^0.11.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 e4d5745dd..f29ac5feb 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,9 +12,7 @@ environment: dependencies: logging: ^1.3.0 meta: ^1.16.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../../../../native_assets_cli/ + native_assets_cli: ^0.14.0-wip record_use: ^0.3.0 dev_dependencies: diff --git a/pkgs/native_assets_cli/tool/dependencies.dart b/pkgs/native_assets_cli/tool/dependencies.dart deleted file mode 100644 index 9cdc8bc9c..000000000 --- a/pkgs/native_assets_cli/tool/dependencies.dart +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -import 'dart:io'; - -import 'package:glob/glob.dart'; -import 'package:glob/list_local_fs.dart'; - -/// Ordered by dependencies. -const packages = [ - 'native_assets_cli', - 'native_toolchain_c', - 'native_assets_builder', -]; - -const pathDependencies = 'path-dependencies'; - -const publishedDependency = 'published-dependency'; - -const commands = [pathDependencies, publishedDependency]; - -// Print all command-line arguments that are Dart files. -void main(List arguments) async { - final command = arguments.firstOrNull; - switch (command) { - case pathDependencies: - return await switchAllToPathDependencies(); - case publishedDependency: - if (arguments.length != 3) { - print('Usage: $publishedDependency '); - return; - } - final packageName = arguments[1]; - if (!packages.contains(packageName)) { - print('Wrong package name.'); - return; - } - final newVersion = arguments[2]; - await switchAllToPublishedDependency(packageName, newVersion); - default: - print('The commands available are:'); - for (final command in commands) { - print(' - $command'); - } - } -} - -/// Switches the pubspecs to path dependencies. -/// -/// Does not add `publish_to: none` back in. -/// -/// Does not bump the version number and add `-wip`. -Future switchAllToPathDependencies() async { - await Future.wait(allPubspecs.map(switchToPathDependencies2)); - print('Did not add `publish_to: none` back in.'); - print('Did not bump the version number and add `-wip`.'); -} - -Future switchToPathDependencies2(File pubspecFile) async { - final newPubspec = switchToPathDependencies(await pubspecFile.readAsString()); - await pubspecFile.writeAsString(newPubspec); -} - -String switchToPathDependencies(String pubspec) { - for (final packageName in packages) { - pubspec = switchToPathDependency(pubspec, packageName); - } - return pubspec; -} - -String switchToPathDependency(String pubspec, String packageName) { - final regex = RegExp(''' $packageName: \\^([0-9.]+) - # $packageName: - # path: ([./]*)$packageName/'''); - final match = regex.firstMatch(pubspec); - if (match == null) { - return pubspec; - } - - final replacement = ''' # $packageName: ^${match.group(1)} - $packageName: - path: ${match.group(2)}$packageName/'''; - return pubspec.replaceFirst(match.group(0)!, replacement); -} - -/// Switches the pubspecs to to published dependency for a specific package. -/// -/// Does not remove `publish_to: none`. -/// -/// Does not modify changelog or version in pubspec. -Future switchAllToPublishedDependency( - String packageName, - String newVersion, -) async { - await Future.wait( - allPubspecs.map( - (e) => switchToPublishedDependency2(e, packageName, newVersion), - ), - ); - print('Switched $packageName to published dependency on $newVersion.'); - print('Did not remove `publish_to: none`.'); - print('Did not modify changelog or version in pubspec.'); -} - -Future switchToPublishedDependency2( - File pubspecFile, - String packageName, - String newVersion, -) async { - final newPubspec = switchToPublishedDependency( - await pubspecFile.readAsString(), - packageName, - newVersion, - ); - await pubspecFile.writeAsString(newPubspec); -} - -String switchToPublishedDependency( - String pubspec, - String packageName, - String newVersion, -) { - final regex = RegExp(''' (# )?$packageName: \\^([0-9.]+) - (# )?$packageName: - (# )? path: ([./]*)$packageName/'''); - final match = regex.firstMatch(pubspec); - if (match == null) { - return pubspec; - } - - final replacement = ''' $packageName: ^$newVersion - # $packageName: - # path: ${match.group(5)}$packageName/'''; - return pubspec.replaceFirst(match.group(0)!, replacement); -} - -final pkgsUri = Platform.script.resolve('../../'); - -List allPubspecs = [ - for (final package in packages) - ...Glob( - '${pkgsUri.resolve('$package/').toFilePath()}**pubspec.yaml', - ).listSync().whereType(), -]; diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml index 7a23d9e97..9b2c316c1 100644 --- a/pkgs/native_toolchain_c/pubspec.yaml +++ b/pkgs/native_toolchain_c/pubspec.yaml @@ -22,9 +22,7 @@ dependencies: glob: ^2.1.1 logging: ^1.3.0 meta: ^1.16.0 - # native_assets_cli: ^0.13.0 - native_assets_cli: - path: ../native_assets_cli/ + native_assets_cli: ^0.14.0-wip pub_semver: ^2.2.0 dev_dependencies: