Skip to content

Commit 2dab035

Browse files
committed
[native_assets_cli] Use namespaced asset types
1 parent 42dd764 commit 2dab035

File tree

58 files changed

+98
-91
lines changed

Some content is hidden

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

58 files changed

+98
-91
lines changed

.github/workflows/native.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
os: [ubuntu, macos, windows]
34-
sdk: [stable, dev]
34+
sdk: [dev]
3535
package: [native_assets_builder, native_assets_cli, native_toolchain_c]
3636
# Breaking changes temporarily break the example run on the Dart SDK until native_assets_builder is rolled into the Dart SDK dev build.
3737
breaking-change: [false]
3838

39-
4039
runs-on: ${{ matrix.os }}-latest
4140

4241
defaults:

.github/workflows/native_toolchain_c.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
os: [ubuntu]
25-
sdk: [stable]
25+
sdk: [dev]
2626
package: [native_toolchain_c]
2727

2828
runs-on: ${{ matrix.os }}-latest
@@ -41,13 +41,11 @@ jobs:
4141
- uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410
4242
with:
4343
ndk-version: r27
44-
if: ${{ matrix.sdk == 'stable' }}
4544

4645
- run: dart pub get
4746

4847
- name: Install native toolchains
4948
run: sudo apt-get update && sudo apt-get install gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-riscv64-linux-gnu
50-
if: ${{ matrix.sdk == 'stable' && matrix.os == 'ubuntu' }}
5149

5250
- run: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
5351
- run: echo "$PWD/depot_tools" >> $GITHUB_PATH
@@ -57,4 +55,3 @@ jobs:
5755
- run: clang --version
5856

5957
- run: dart test
60-
if: ${{ matrix.sdk == 'stable' }}

pkgs/native_assets_builder/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.15.0-wip
2+
3+
- Bump `package:native_assets_cli` to 0.15.0.
4+
15
## 0.14.0
26

37
- Bump `package:native_assets_cli` to 0.14.0.

pkgs/native_assets_builder/pubspec.yaml

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

7-
# publish_to: none
8-
97
resolution: workspace
108

119
environment:
@@ -18,7 +16,7 @@ dependencies:
1816
graphs: ^2.3.2
1917
logging: ^1.3.0
2018
meta: ^1.16.0
21-
native_assets_cli: ^0.14.0
19+
native_assets_cli: ^0.15.0-wip
2220
package_config: ^2.1.0
2321
pub_semver: ^2.2.0
2422
yaml: ^3.1.3

pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ environment:
1212
dependencies:
1313
logging: ^1.3.0
1414
meta: ^1.16.0
15-
native_assets_cli: ^0.14.0
16-
native_toolchain_c: ^0.11.0
15+
native_assets_cli: ^0.15.0-wip
16+
native_toolchain_c: ^0.12.0-wip
1717

1818
dev_dependencies:
1919
lints: ^5.1.1

pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
complex_link_helper:
1515
path: ../complex_link_helper/
1616
logging: ^1.3.0
17-
native_assets_cli: ^0.14.0
17+
native_assets_cli: ^0.15.0-wip
1818

1919
dev_dependencies:
2020
lints: ^5.1.1

pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
cli_config: ^0.2.0
1414
logging: ^1.3.0
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
lints: ^5.1.1

pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
cyclic_package_2:
1414
path: ../cyclic_package_2
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
lints: ^5.1.1

pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
cyclic_package_1:
1414
path: ../cyclic_package_1
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
lints: ^5.1.1

pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
fail_build:
1414
path: ../fail_build/
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
depend_on_fail_build:
1414
path: ../depend_on_fail_build/
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
lints: ^5.1.1

pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
fail_on_os_sdk_version_linker:
1414
path: ../fail_on_os_sdk_version_linker/
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/native_add/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies:
1313
logging: ^1.3.0
1414
native_add:
1515
path: ../native_add/
16-
native_assets_cli: ^0.14.0
17-
native_toolchain_c: ^0.11.0
16+
native_assets_cli: ^0.15.0-wip
17+
native_toolchain_c: ^0.12.0-wip
1818

1919
dev_dependencies:
2020
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ environment:
1212

1313
dependencies:
1414
logging: ^1.3.0
15-
native_assets_cli: ^0.14.0
16-
native_toolchain_c: ^0.11.0
15+
native_assets_cli: ^0.15.0-wip
16+
native_toolchain_c: ^0.12.0-wip
1717

1818
dev_dependencies:
1919
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
logging: ^1.3.0
1414
meta: ^1.16.0
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
lints: ^5.1.1

pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414
package_with_metadata:
1515
path: ../package_with_metadata/
1616

pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
lints: ^5.1.1

pkgs/native_assets_builder/test_data/relative_path/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
14+
native_assets_cli: ^0.15.0-wip
1515

1616
dev_dependencies:
1717
lints: ^5.1.1

pkgs/native_assets_builder/test_data/reusable_dynamic_library/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ environment:
1313

1414
dependencies:
1515
logging: ^1.1.1
16-
native_assets_cli: ^0.14.0
17-
native_toolchain_c: ^0.11.0
16+
native_assets_cli: ^0.15.0-wip
17+
native_toolchain_c: ^0.12.0-wip
1818

1919
dev_dependencies:
2020
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/reuse_dynamic_library/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ environment:
1212

1313
dependencies:
1414
logging: ^1.1.1
15-
native_assets_cli: ^0.14.0
16-
native_toolchain_c: ^0.11.0
15+
native_assets_cli: ^0.15.0-wip
16+
native_toolchain_c: ^0.12.0-wip
1717
reusable_dynamic_library:
1818
path: ../reusable_dynamic_library/
1919

pkgs/native_assets_builder/test_data/simple_data_asset/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
14+
native_assets_cli: ^0.15.0-wip
1515

1616
dev_dependencies:
1717
lints: ^5.1.1

pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
dependencies:
1313
cli_config: ^0.2.0
1414
logging: ^1.3.0
15-
native_assets_cli: ^0.14.0
15+
native_assets_cli: ^0.15.0-wip
1616

1717
dev_dependencies:
1818
lints: ^5.1.1

pkgs/native_assets_builder/test_data/system_library/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/transformer/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environment:
1111

1212
dependencies:
1313
crypto: ^3.0.6
14-
native_assets_cli: ^0.14.0
14+
native_assets_cli: ^0.15.0-wip
1515

1616
dev_dependencies:
1717
lints: ^5.1.1

pkgs/native_assets_builder/test_data/treeshaking_native_libs/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ environment:
1111

1212
dependencies:
1313
logging: ^1.3.0
14-
native_assets_cli: ^0.14.0
15-
native_toolchain_c: ^0.11.0
14+
native_assets_cli: ^0.15.0-wip
15+
native_toolchain_c: ^0.12.0-wip
1616

1717
dev_dependencies:
1818
ffigen: ^18.0.0

pkgs/native_assets_builder/test_data/use_all_api/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ environment:
1313
dependencies:
1414
cli_config: ^0.2.0
1515
logging: ^1.3.0
16-
native_assets_cli: ^0.14.0
16+
native_assets_cli: ^0.15.0-wip
1717

1818
dev_dependencies:
1919
lints: ^5.1.1

pkgs/native_assets_builder/test_data/user_defines/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
lints: ^5.1.1

pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
lints: ^5.1.1

pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
sdk: '>=3.7.0 <4.0.0'
1111

1212
dependencies:
13-
native_assets_cli: ^0.14.0
13+
native_assets_cli: ^0.15.0-wip
1414

1515
dev_dependencies:
1616
lints: ^5.1.1

0 commit comments

Comments
 (0)