Skip to content

[infra] Remove path dependencies #2179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2025
Merged

[infra] Remove path dependencies #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce6ac18
[infra] remove path dependencies
dcharkes Apr 8, 2025
5ee6749
more cleanup
dcharkes Apr 8, 2025
20443ed
remove tool
dcharkes Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down
30 changes: 22 additions & 8 deletions pkgs/native_assets_builder/test/helpers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/native_add/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/reusable_dynamic_library/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions pkgs/native_assets_builder/test_data/reuse_dynamic_library/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
4 changes: 1 addition & 3 deletions pkgs/native_assets_builder/test_data/simple_data_asset/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading