[infra] Remove path dependencies (#2179)

Bug:

* #1223

Split off:

* #1884

This PR removes the path dependencies on `package:native_assets_cli` and `package:native_toolchain_c` within the workspace.

For test projects, when copying them over, add `dependency_overrides` to the right location.

`pkgs/native_assets_cli/tool/dependencies.dart` is removed. Upgrading dependencies can be done with dart pub upgrade `native_assets_cli --tighten --major-versions`

Author: dcharkes

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

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<void> makePubWorkspace(List<String> 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);

pkgs/native_assets_builder/test/helpers.dart

@@ -232,7 +232,11 @@ extension AssetIterable on Iterable<EncodedAsset> {
   }
 }
 
-Future<void> copyTestProjects({Uri? sourceUri, required Uri targetUri}) async {
+Future<void> 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<void> 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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/
 

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

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

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

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/
 

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