Skip to content

Commit e6549b4

Browse files
authored
[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`
1 parent b45d842 commit e6549b4

File tree

48 files changed

+99
-340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+99
-340
lines changed

pkgs/native_assets_builder/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ dependencies:
1818
graphs: ^2.3.2
1919
logging: ^1.3.0
2020
meta: ^1.16.0
21-
# native_assets_cli: ^0.13.0
22-
native_assets_cli:
23-
path: ../native_assets_cli/
21+
native_assets_cli: ^0.14.0-wip
2422
package_config: ^2.1.0
2523
pub_semver: ^2.2.0
2624
yaml: ^3.1.3

pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void main() async {
1515
late Uri tempUri;
1616
setUp(() async {
1717
tempUri = await tempDirForTest();
18-
await copyTestProjects(targetUri: tempUri);
18+
await copyTestProjects(targetUri: tempUri, addDependencyOverrides: false);
1919
});
2020

2121
Future<void> makePubWorkspace(List<String> packages) async {
@@ -44,6 +44,20 @@ workspace:
4444
- $package/
4545
''';
4646
}
47+
workspacePubSpec += '''
48+
49+
dependency_overrides:
50+
''';
51+
const packagesToOverride = ['native_assets_cli', 'native_toolchain_c'];
52+
for (final package in packagesToOverride) {
53+
workspacePubSpec += '''
54+
$package:
55+
path: ${pkgNativeAssetsBuilderUri.resolve('../$package/').toFilePath()}
56+
''';
57+
}
58+
59+
printOnFailure(workspacePubSpecUri.toString());
60+
printOnFailure(workspacePubSpec);
4761
await File.fromUri(workspacePubSpecUri).writeAsString(workspacePubSpec);
4862

4963
await runPubGet(workingDirectory: tempUri, logger: logger);

pkgs/native_assets_builder/test/helpers.dart

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,11 @@ extension AssetIterable on Iterable<EncodedAsset> {
232232
}
233233
}
234234

235-
Future<void> copyTestProjects({Uri? sourceUri, required Uri targetUri}) async {
235+
Future<void> copyTestProjects({
236+
Uri? sourceUri,
237+
required Uri targetUri,
238+
bool addDependencyOverrides = true,
239+
}) async {
236240
sourceUri ??= testDataUri;
237241
final manifestUri = sourceUri.resolve('manifest.yaml');
238242
final manifestFile = File.fromUri(manifestUri);
@@ -277,13 +281,23 @@ Future<void> copyTestProjects({Uri? sourceUri, required Uri targetUri}) async {
277281
for (final pathToModify in filesToModify) {
278282
final sourceFile = File.fromUri(sourceUri.resolveUri(pathToModify));
279283
final targetFileUri = targetUri.resolveUri(pathToModify);
280-
final sourceString = await sourceFile.readAsString();
281-
final modifiedString = sourceString
282-
.replaceAll(
283-
'path: ../../',
284-
'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}',
285-
)
286-
.replaceAll('resolution: workspace', '');
284+
var sourceString = await sourceFile.readAsString();
285+
if (addDependencyOverrides &&
286+
!pathToModify.path.contains('native_add_version_skew')) {
287+
sourceString += '''
288+
289+
dependency_overrides:
290+
''';
291+
const packagesToOverride = ['native_assets_cli', 'native_toolchain_c'];
292+
for (final package in packagesToOverride) {
293+
sourceString += '''
294+
$package:
295+
path: ${pkgNativeAssetsBuilderUri.resolve('../$package/').toFilePath()}
296+
''';
297+
}
298+
}
299+
300+
final modifiedString = sourceString.replaceAll('resolution: workspace', '');
287301
await File.fromUri(
288302
targetFileUri,
289303
).writeAsString(modifiedString, flush: true);

pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@ environment:
1212
dependencies:
1313
logging: ^1.3.0
1414
meta: ^1.16.0
15-
# native_assets_cli: ^0.13.0
16-
native_assets_cli:
17-
path: ../../../native_assets_cli/
18-
# native_toolchain_c: ^0.10.0
19-
native_toolchain_c:
20-
path: ../../../native_toolchain_c/
15+
native_assets_cli: ^0.14.0-wip
16+
native_toolchain_c: ^0.11.0-wip
2117

2218
dev_dependencies:
2319
lints: ^5.1.1

pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ dependencies:
1414
complex_link_helper:
1515
path: ../complex_link_helper/
1616
logging: ^1.3.0
17-
# native_assets_cli: ^0.13.0
18-
native_assets_cli:
19-
path: ../../../native_assets_cli/
17+
native_assets_cli: ^0.14.0-wip
2018

2119
dev_dependencies:
2220
lints: ^5.1.1

pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ environment:
1212
dependencies:
1313
cli_config: ^0.2.0
1414
logging: ^1.3.0
15-
# native_assets_cli: ^0.13.0
16-
native_assets_cli:
17-
path: ../../../native_assets_cli/
15+
native_assets_cli: ^0.14.0-wip
1816

1917
dev_dependencies:
2018
lints: ^5.1.1

pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ environment:
1212
dependencies:
1313
cyclic_package_2:
1414
path: ../cyclic_package_2
15-
# native_assets_cli: ^0.13.0
16-
native_assets_cli:
17-
path: ../../../native_assets_cli/
15+
native_assets_cli: ^0.14.0-wip
1816

1917
dev_dependencies:
2018
lints: ^5.1.1

pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ environment:
1212
dependencies:
1313
cyclic_package_1:
1414
path: ../cyclic_package_1
15-
# native_assets_cli: ^0.13.0
16-
native_assets_cli:
17-
path: ../../../native_assets_cli/
15+
native_assets_cli: ^0.14.0-wip
1816

1917
dev_dependencies:
2018
lints: ^5.1.1

pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ environment:
1212
dependencies:
1313
fail_build:
1414
path: ../fail_build/
15-
# native_assets_cli: ^0.13.0
16-
native_assets_cli:
17-
path: ../../../native_assets_cli/
15+
native_assets_cli: ^0.14.0-wip
1816

1917
dev_dependencies:
2018
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ environment:
1212
dependencies:
1313
depend_on_fail_build:
1414
path: ../depend_on_fail_build/
15-
# native_assets_cli: ^0.13.0
16-
native_assets_cli:
17-
path: ../../../native_assets_cli/
15+
native_assets_cli: ^0.14.0-wip
1816

1917
dev_dependencies:
2018
ffigen: ^18.0.0

0 commit comments

Comments
 (0)