Skip to content

Commit dd61040

Browse files
mosuemmosuem
authored
Merge branch 'main' into copyResources
2 parents 9e52249 + 7749425 commit dd61040

File tree

47 files changed

+304
-171
lines changed

Some content is hidden

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

47 files changed

+304
-171
lines changed

‎pkgs/native_assets_builder/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.7.1-wip
2+
3+
- Nothing yet.
4+
15
## 0.7.0
26

37
- Add support for `hook/link.dart` including dry runs.

‎pkgs/native_assets_builder/pubspec.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: native_assets_builder
22
description: >-
33
This package is the backend that invokes build hooks.
4-
version: 0.7.0
4+
version: 0.7.1-wip
55
repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_builder
66

7-
# publish_to: none
7+
publish_to: none
88

99
environment:
1010
sdk: '>=3.3.0 <4.0.0'
@@ -13,9 +13,9 @@ dependencies:
1313
collection: ^1.18.0
1414
graphs: ^2.3.1
1515
logging: ^1.2.0
16-
native_assets_cli: ^0.6.0
17-
# native_assets_cli:
18-
# path: ../native_assets_cli/
16+
# native_assets_cli: ^0.6.0
17+
native_assets_cli:
18+
path: ../native_assets_cli/
1919
package_config: ^2.1.0
2020
yaml: ^3.1.2
2121
yaml_edit: ^2.1.0

‎pkgs/native_assets_builder/test_data/add_asset_link/hook/build.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ void main(List<String> arguments) async {
2222
dartBuildFiles: ['hook/build.dart'],
2323
linkModePreference: LinkModePreference.dynamic,
2424
).run(
25-
buildConfig: config,
26-
buildOutput: output,
25+
config: config,
26+
output: output,
2727
logger: logger,
2828
linkInPackage: 'add_asset_link',
2929
);

‎pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ environment:
1010
dependencies:
1111
logging: ^1.1.1
1212
meta: ^1.12.0
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
16-
native_toolchain_c: ^0.4.2
17-
# native_toolchain_c:
18-
# path: ../../../native_toolchain_c/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
16+
# native_toolchain_c: ^0.4.2
17+
native_toolchain_c:
18+
path: ../../../native_toolchain_c/
1919

2020
dev_dependencies:
2121
lints: ^3.0.0

‎pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies:
1212
complex_link_helper:
1313
path: ../complex_link_helper/
1414
logging: ^1.1.1
15-
native_assets_cli: ^0.6.0
16-
# native_assets_cli:
17-
# path: ../../../native_assets_cli/
15+
# native_assets_cli: ^0.6.0
16+
native_assets_cli:
17+
path: ../../../native_assets_cli/
1818

1919
dev_dependencies:
2020
lints: ^3.0.0

‎pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ environment:
1010
dependencies:
1111
cli_config: ^0.2.0
1212
logging: ^1.1.1
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
1616

1717
dev_dependencies:
1818
lints: ^3.0.0

‎pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ environment:
1010
dependencies:
1111
cyclic_package_2:
1212
path: ../cyclic_package_2
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
1616
yaml: ^3.1.1
1717
yaml_edit: ^2.1.0
1818

‎pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ environment:
1010
dependencies:
1111
cyclic_package_1:
1212
path: ../cyclic_package_1
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
1616
yaml: ^3.1.1
1717
yaml_edit: ^2.1.0
1818

‎pkgs/native_assets_builder/test_data/drop_dylib_link/hook/build.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ void main(List<String> arguments) async {
2424
dartBuildFiles: ['hook/build.dart'],
2525
linkModePreference: LinkModePreference.dynamic,
2626
).run(
27-
buildConfig: config,
28-
buildOutput: output,
27+
config: config,
28+
output: output,
2929
logger: logger,
3030
linkInPackage: packageName,
3131
);
@@ -39,8 +39,8 @@ void main(List<String> arguments) async {
3939
dartBuildFiles: ['hook/build.dart'],
4040
linkModePreference: LinkModePreference.dynamic,
4141
).run(
42-
buildConfig: config,
43-
buildOutput: output,
42+
config: config,
43+
output: output,
4444
logger: logger,
4545
linkInPackage: packageName,
4646
);

‎pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ environment:
1010
dependencies:
1111
logging: ^1.1.1
1212
meta: ^1.12.0
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
16-
native_toolchain_c: ^0.4.2
17-
# native_toolchain_c:
18-
# path: ../../../native_toolchain_c/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
16+
# native_toolchain_c: ^0.4.2
17+
native_toolchain_c:
18+
path: ../../../native_toolchain_c/
1919

2020
dev_dependencies:
2121
lints: ^3.0.0

‎pkgs/native_assets_builder/test_data/native_add/hook/build.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ void main(List<String> arguments) async {
1919
dartBuildFiles: ['hook/build.dart'],
2020
);
2121
await cbuilder.run(
22-
buildConfig: config,
23-
buildOutput: output,
22+
config: config,
23+
output: output,
2424
logger: Logger('')
2525
..level = Level.ALL
2626
..onRecord.listen((record) {

‎pkgs/native_assets_builder/test_data/native_add/pubspec.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ environment:
99

1010
dependencies:
1111
logging: ^1.1.1
12-
native_assets_cli: ^0.6.0
13-
# native_assets_cli:
14-
# path: ../../../native_assets_cli/
15-
native_toolchain_c: ^0.4.2
16-
# native_toolchain_c:
17-
# path: ../../../native_toolchain_c/
12+
# native_assets_cli: ^0.6.0
13+
native_assets_cli:
14+
path: ../../../native_assets_cli/
15+
# native_toolchain_c: ^0.4.2
16+
native_toolchain_c:
17+
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
2020
ffigen: ^8.0.2

‎pkgs/native_assets_builder/test_data/native_add_add_source/hook/build.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void main(List<String> arguments) async {
2020
dartBuildFiles: ['hook/build.dart'],
2121
);
2222
await cbuilder.run(
23-
buildConfig: config,
24-
buildOutput: output,
23+
config: config,
24+
output: output,
2525
logger: Logger('')
2626
..level = Level.ALL
2727
..onRecord.listen((record) {

‎pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ environment:
99

1010
dependencies:
1111
logging: ^1.1.1
12-
native_assets_cli: ^0.6.0
13-
# native_assets_cli:
14-
# path: ../../../native_assets_cli/
15-
native_toolchain_c: ^0.4.2
16-
# native_toolchain_c:
17-
# path: ../../../native_toolchain_c/
12+
# native_assets_cli: ^0.6.0
13+
native_assets_cli:
14+
path: ../../../native_assets_cli/
15+
# native_toolchain_c: ^0.4.2
16+
native_toolchain_c:
17+
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
2020
ffigen: ^8.0.2

‎pkgs/native_assets_builder/test_data/native_subtract/hook/build.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ void main(List<String> arguments) async {
1919
dartBuildFiles: ['hook/build.dart'],
2020
);
2121
await cbuilder.run(
22-
buildConfig: config,
23-
buildOutput: output,
22+
config: config,
23+
output: output,
2424
logger: Logger('')
2525
..level = Level.ALL
2626
..onRecord.listen((record) {

‎pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ environment:
99

1010
dependencies:
1111
logging: ^1.1.1
12-
native_assets_cli: ^0.6.0
13-
# native_assets_cli:
14-
# path: ../../../native_assets_cli/
15-
native_toolchain_c: ^0.4.2
16-
# native_toolchain_c:
17-
# path: ../../../native_toolchain_c/
12+
# native_assets_cli: ^0.6.0
13+
native_assets_cli:
14+
path: ../../../native_assets_cli/
15+
# native_toolchain_c: ^0.4.2
16+
native_toolchain_c:
17+
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
2020
ffigen: ^8.0.2

‎pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ environment:
1010
dependencies:
1111
logging: ^1.1.1
1212
meta: ^1.12.0
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
1616

1717
dev_dependencies:
1818
lints: ^3.0.0

‎pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ environment:
88
sdk: '>=3.3.0 <4.0.0'
99

1010
dependencies:
11-
native_assets_cli: ^0.6.0
12-
# native_assets_cli:
13-
# path: ../../../native_assets_cli/
11+
# native_assets_cli: ^0.6.0
12+
native_assets_cli:
13+
path: ../../../native_assets_cli/
1414
package_with_metadata:
1515
path: ../package_with_metadata/
1616
yaml: ^3.1.1

‎pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ environment:
88
sdk: '>=3.3.0 <4.0.0'
99

1010
dependencies:
11-
native_assets_cli: ^0.6.0
12-
# native_assets_cli:
13-
# path: ../../../native_assets_cli/
11+
# native_assets_cli: ^0.6.0
12+
native_assets_cli:
13+
path: ../../../native_assets_cli/
1414
yaml: ^3.1.1
1515
yaml_edit: ^2.1.0
1616

‎pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ environment:
1010
dependencies:
1111
cli_config: ^0.2.0
1212
logging: ^1.1.1
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../native_assets_cli/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
1616

1717
dev_dependencies:
1818
lints: ^3.0.0

‎pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ environment:
88
sdk: '>=3.3.0 <4.0.0'
99

1010
dependencies:
11-
native_assets_cli: ^0.6.0
12-
# native_assets_cli:
13-
# path: ../../../native_assets_cli/
11+
# native_assets_cli: ^0.6.0
12+
native_assets_cli:
13+
path: ../../../native_assets_cli/
1414
yaml: ^3.1.1
1515
yaml_edit: ^2.1.0
1616

‎pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ environment:
88
sdk: '>=3.3.0 <4.0.0'
99

1010
dependencies:
11-
native_assets_cli: ^0.6.0
12-
# native_assets_cli:
13-
# path: ../../../native_assets_cli/
11+
# native_assets_cli: ^0.6.0
12+
native_assets_cli:
13+
path: ../../../native_assets_cli/
1414
yaml: ^3.1.1
1515
yaml_edit: ^2.1.0
1616

‎pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ environment:
88
sdk: '>=3.3.0 <4.0.0'
99

1010
dependencies:
11-
native_assets_cli: ^0.6.0
12-
# native_assets_cli:
13-
# path: ../../../native_assets_cli/
11+
# native_assets_cli: ^0.6.0
12+
native_assets_cli:
13+
path: ../../../native_assets_cli/
1414
yaml: ^3.1.1
1515
yaml_edit: ^2.1.0
1616

‎pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ environment:
88
sdk: '>=3.3.0 <4.0.0'
99

1010
dependencies:
11-
native_assets_cli: ^0.6.0
12-
# native_assets_cli:
13-
# path: ../../../native_assets_cli/
11+
# native_assets_cli: ^0.6.0
12+
native_assets_cli:
13+
path: ../../../native_assets_cli/
1414
yaml: ^3.1.1
1515
yaml_edit: ^2.1.0
1616

‎pkgs/native_assets_cli/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## 0.6.1
1+
## 0.6.1-wip
22

3+
- Introduce `Builder` and `Linker` interface.
34
- Copy `resources.json` to the build directory.
45

56
## 0.6.0

‎pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ environment:
1010

1111
dependencies:
1212
logging: ^1.1.1
13-
native_assets_cli: ^0.6.0
14-
# native_assets_cli:
15-
# path: ../../../../native_assets_cli/
13+
# native_assets_cli: ^0.6.0
14+
native_assets_cli:
15+
path: ../../../../native_assets_cli/
1616

1717
dev_dependencies:
1818
ffigen: ^8.0.2

‎pkgs/native_assets_cli/example/build/native_add_library/hook/build.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ void main(List<String> args) async {
1818
dartBuildFiles: ['hook/build.dart'],
1919
);
2020
await cbuilder.run(
21-
buildConfig: config,
22-
buildOutput: output,
21+
config: config,
22+
output: output,
2323
logger: Logger('')
2424
..level = Level.ALL
2525
..onRecord.listen((record) => print(record.message)),

0 commit comments

Comments
 (0)