forked from firka/flutter
[native assets] Roll dependencies (#162017)
This PR rolls in a number of breaking changes for native assets: * Pub workspaces are now supported, this requires a refactoring to how the `NativeAssetsBuildRunner` is used. Most notably it requires being explicit about the `runPackageName`. Flutter does not seem to have that value, but it does have the `projectUri` which can be used to find the package name via the package config. * The API for build hooks has been redesigned. This PR updates the project template, test project files, and test project strings. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
This commit is contained in:
@@ -8,13 +8,13 @@ import 'package:native_assets_cli/code_assets_builder.dart';
|
||||
import 'package:native_toolchain_c/native_toolchain_c.dart';
|
||||
|
||||
void main(List<String> args) async {
|
||||
await build(args, (BuildConfig config, BuildOutputBuilder output) async {
|
||||
if (!config.buildAssetTypes.contains(CodeAsset.type)) {
|
||||
await build(args, (BuildInput input, BuildOutputBuilder output) async {
|
||||
if (!input.config.buildAssetTypes.contains(CodeAsset.type)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final String assetName;
|
||||
if (config.linkingEnabled) {
|
||||
if (input.config.linkingEnabled) {
|
||||
// The link hook will be run. So emit an asset with a name that is
|
||||
// not used, so that the link hook can rename it.
|
||||
// This will ensure the test fails if the link-hooks are not run
|
||||
@@ -23,9 +23,9 @@ void main(List<String> args) async {
|
||||
} else {
|
||||
// The link hook will not be run, so immediately emit an asset for
|
||||
// bundling.
|
||||
assetName = '${config.packageName}_bindings_generated.dart';
|
||||
assetName = '${input.packageName}_bindings_generated.dart';
|
||||
}
|
||||
final String packageName = config.packageName;
|
||||
final String packageName = input.packageName;
|
||||
final CBuilder cbuilder = CBuilder.library(
|
||||
name: packageName,
|
||||
assetName: assetName,
|
||||
@@ -34,19 +34,19 @@ void main(List<String> args) async {
|
||||
);
|
||||
final BuildOutputBuilder outputCatcher = BuildOutputBuilder();
|
||||
await cbuilder.run(
|
||||
config: config,
|
||||
input: input,
|
||||
output: outputCatcher,
|
||||
logger:
|
||||
Logger('')
|
||||
..level = Level.ALL
|
||||
..onRecord.listen((LogRecord record) => print(record.message)),
|
||||
);
|
||||
final BuildOutput catchedOutput = BuildOutput(outputCatcher.json);
|
||||
output.addDependencies(catchedOutput.dependencies);
|
||||
final BuildOutput caughtOutput = BuildOutput(outputCatcher.json);
|
||||
output.addDependencies(caughtOutput.dependencies);
|
||||
// Send the asset to hook/link.dart or immediately for bundling.
|
||||
output.codeAssets.add(
|
||||
catchedOutput.codeAssets.single,
|
||||
linkInPackage: config.linkingEnabled ? 'link_hook' : null,
|
||||
output.assets.code.add(
|
||||
caughtOutput.assets.code.single,
|
||||
linkInPackage: input.config.linkingEnabled ? 'link_hook' : null,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
import 'package:native_assets_cli/code_assets.dart';
|
||||
|
||||
void main(List<String> args) async {
|
||||
await link(args, (LinkConfig config, LinkOutputBuilder output) async {
|
||||
if (!config.buildAssetTypes.contains(CodeAsset.type)) {
|
||||
await link(args, (LinkInput input, LinkOutputBuilder output) async {
|
||||
if (!input.config.buildAssetTypes.contains(CodeAsset.type)) {
|
||||
return;
|
||||
}
|
||||
final CodeAsset asset = config.codeAssets.single;
|
||||
final String packageName = config.packageName;
|
||||
output.codeAssets.add(
|
||||
final CodeAsset asset = input.assets.code.single;
|
||||
final String packageName = input.packageName;
|
||||
output.assets.code.add(
|
||||
CodeAsset(
|
||||
package: packageName,
|
||||
// Change the asset id to something that is used.
|
||||
@@ -22,6 +22,5 @@ void main(List<String> args) async {
|
||||
file: asset.file,
|
||||
),
|
||||
);
|
||||
output.addDependency(config.packageRoot.resolve('hook/link.dart'));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@ environment:
|
||||
|
||||
dependencies:
|
||||
logging: 1.3.0
|
||||
native_assets_cli: 0.10.0
|
||||
native_toolchain_c: 0.7.0
|
||||
native_assets_cli: 0.11.0
|
||||
native_toolchain_c: 0.8.0
|
||||
|
||||
async: 2.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||
collection: 1.19.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||
@@ -68,4 +68,4 @@ dev_dependencies:
|
||||
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||
yaml_edit: 2.2.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||
|
||||
# PUBSPEC CHECKSUM: 566e
|
||||
# PUBSPEC CHECKSUM: d670
|
||||
|
||||
Reference in New Issue
Block a user