Skip to content

Commit c78a106

Browse files
dcharkesdcharkes
committed
[native_assets_cli] Hide CodeAsset.type and DataAsset.type 
1 parent 13816ef commit c78a106

File tree

63 files changed

+594
-511
lines changed

Some content is hidden

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

63 files changed

+594
-511
lines changed

‎pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ class NativeAssetsBuildRunner {
106106
)?.forEach((key, value) => metadata[key] = value);
107107

108108
final inputBuilder = BuildInputBuilder();
109-
inputBuilder.config.setupShared(
110-
buildAssetTypes: [for (final e in extensions) ...e.buildAssetTypes],
111-
);
109+
112110
for (final e in extensions) {
113111
e.setupBuildInput(inputBuilder);
114112
}
@@ -199,9 +197,6 @@ class NativeAssetsBuildRunner {
199197
var hookResult = HookResult(encodedAssets: buildResult.encodedAssets);
200198
for (final package in buildPlan) {
201199
final inputBuilder = LinkInputBuilder();
202-
inputBuilder.config.setupShared(
203-
buildAssetTypes: [for (final e in extensions) ...e.buildAssetTypes],
204-
);
205200
for (final e in extensions) {
206201
e.setupLinkInput(inputBuilder);
207202
}

‎pkgs/native_assets_builder/test/build_runner/build_dependencies_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void main() async {
2929
logger,
3030
dartExecutable,
3131
capturedLogs: logMessages,
32-
buildAssetTypes: [CodeAsset.type],
32+
buildAssetTypes: [BuildAssetType.code],
3333
))!;
3434
expect(
3535
logMessages.join('\n'),

‎pkgs/native_assets_builder/test/build_runner/build_runner_asset_id_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void main() async {
2424
packageUri,
2525
createCapturingLogger(logMessages, level: Level.SEVERE),
2626
dartExecutable,
27-
buildAssetTypes: [CodeAsset.type],
27+
buildAssetTypes: [BuildAssetType.code],
2828
);
2929
final fullLog = logMessages.join('\n');
3030
expect(result, isNull);
@@ -52,7 +52,7 @@ void main() async {
5252
packageUri,
5353
logger,
5454
dartExecutable,
55-
buildAssetTypes: [CodeAsset.type],
55+
buildAssetTypes: [BuildAssetType.code],
5656
);
5757
expect(result, isNotNull);
5858
}

‎pkgs/native_assets_builder/test/build_runner/build_runner_caching_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void main() async {
2929
logger,
3030
dartExecutable,
3131
capturedLogs: logMessages,
32-
buildAssetTypes: [CodeAsset.type],
32+
buildAssetTypes: [BuildAssetType.code],
3333
))!;
3434
expect(
3535
logMessages.join('\n'),
@@ -52,7 +52,7 @@ void main() async {
5252
logger,
5353
dartExecutable,
5454
capturedLogs: logMessages,
55-
buildAssetTypes: [CodeAsset.type],
55+
buildAssetTypes: [BuildAssetType.code],
5656
))!;
5757
final hookUri = packageUri.resolve('hook/build.dart');
5858
expect(
@@ -97,7 +97,7 @@ void main() async {
9797
packageUri,
9898
logger,
9999
dartExecutable,
100-
buildAssetTypes: [CodeAsset.type],
100+
buildAssetTypes: [BuildAssetType.code],
101101
))!;
102102
await expectSymbols(
103103
asset: CodeAsset.fromEncoded(result.encodedAssets.single),
@@ -117,7 +117,7 @@ void main() async {
117117
packageUri,
118118
logger,
119119
dartExecutable,
120-
buildAssetTypes: [CodeAsset.type],
120+
buildAssetTypes: [BuildAssetType.code],
121121
))!;
122122

123123
final cUri = packageUri.resolve('src/').resolve('native_add.c');
@@ -153,7 +153,7 @@ void main() async {
153153
packageUri,
154154
logger,
155155
dartExecutable,
156-
buildAssetTypes: [CodeAsset.type],
156+
buildAssetTypes: [BuildAssetType.code],
157157
))!;
158158
{
159159
final compiledHook =
@@ -183,7 +183,7 @@ void main() async {
183183
packageUri,
184184
logger,
185185
dartExecutable,
186-
buildAssetTypes: [CodeAsset.type],
186+
buildAssetTypes: [BuildAssetType.code],
187187
))!;
188188

189189
final hookUri = packageUri.resolve('hook/build.dart');
@@ -217,7 +217,7 @@ void main() async {
217217
packageUri,
218218
logger,
219219
dartExecutable,
220-
buildAssetTypes: [CodeAsset.type],
220+
buildAssetTypes: [BuildAssetType.code],
221221
hookEnvironment:
222222
modifiedEnvKey == 'PATH'
223223
? null
@@ -255,7 +255,7 @@ void main() async {
255255
packageUri,
256256
logger,
257257
dartExecutable,
258-
buildAssetTypes: [CodeAsset.type],
258+
buildAssetTypes: [BuildAssetType.code],
259259
))!;
260260
expect(logMessages.join('\n'), contains('hook.dill'));
261261
expect(

‎pkgs/native_assets_builder/test/build_runner/build_runner_failure_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void main() async {
2626
packageUri,
2727
logger,
2828
dartExecutable,
29-
buildAssetTypes: [CodeAsset.type],
29+
buildAssetTypes: [BuildAssetType.code],
3030
))!;
3131
expect(result.encodedAssets.length, 1);
3232
await expectSymbols(
@@ -50,7 +50,7 @@ void main() async {
5050
packageUri,
5151
createCapturingLogger(logMessages, level: Level.SEVERE),
5252
dartExecutable,
53-
buildAssetTypes: [CodeAsset.type],
53+
buildAssetTypes: [BuildAssetType.code],
5454
);
5555
final fullLog = logMessages.join('\n');
5656
expect(result, isNull);
@@ -80,7 +80,7 @@ void main() async {
8080
packageUri,
8181
logger,
8282
dartExecutable,
83-
buildAssetTypes: [CodeAsset.type],
83+
buildAssetTypes: [BuildAssetType.code],
8484
))!;
8585
expect(result.encodedAssets.length, 1);
8686
await expectSymbols(
@@ -111,7 +111,7 @@ void main() async {
111111
logger,
112112
capturedLogs: logMessages,
113113
dartExecutable,
114-
buildAssetTypes: [CodeAsset.type],
114+
buildAssetTypes: [BuildAssetType.code],
115115
);
116116
Matcher stringContainsBuildHookCompilation(String packageName) =>
117117
stringContainsInOrder([

‎pkgs/native_assets_builder/test/build_runner/build_runner_non_root_package_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void main() async {
2828
dartExecutable,
2929
capturedLogs: logMessages,
3030
runPackageName: 'some_dev_dep',
31-
buildAssetTypes: [CodeAsset.type],
31+
buildAssetTypes: [BuildAssetType.code],
3232
))!;
3333
expect(result.encodedAssets, isEmpty);
3434
expect(result.dependencies, isEmpty);
@@ -43,7 +43,7 @@ void main() async {
4343
dartExecutable,
4444
capturedLogs: logMessages,
4545
runPackageName: 'native_add',
46-
buildAssetTypes: [CodeAsset.type],
46+
buildAssetTypes: [BuildAssetType.code],
4747
))!;
4848
expect(result.encodedAssets, isNotEmpty);
4949
expect(

‎pkgs/native_assets_builder/test/build_runner/build_runner_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void main() async {
3030
logger,
3131
dartExecutable,
3232
capturedLogs: logMessages,
33-
buildAssetTypes: [CodeAsset.type],
33+
buildAssetTypes: [BuildAssetType.code],
3434
))!;
3535
expect(
3636
logMessages.join('\n'),
@@ -74,7 +74,7 @@ void main() async {
7474
logger,
7575
dartExecutable,
7676
capturedLogs: logMessages,
77-
buildAssetTypes: [CodeAsset.type],
77+
buildAssetTypes: [BuildAssetType.code],
7878
))!;
7979
expect(
8080
false,

‎pkgs/native_assets_builder/test/build_runner/conflicting_dylib_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void main() async {
2424
packageUri,
2525
createCapturingLogger(logMessages, level: Level.SEVERE),
2626
dartExecutable,
27-
buildAssetTypes: [CodeAsset.type],
27+
buildAssetTypes: [BuildAssetType.code],
2828
);
2929
final fullLog = logMessages.join('\n');
3030
expect(result, isNull);
@@ -49,15 +49,15 @@ void main() async {
4949
logger,
5050
linkingEnabled: true,
5151
dartExecutable,
52-
buildAssetTypes: [CodeAsset.type],
52+
buildAssetTypes: [BuildAssetType.code],
5353
))!;
5454

5555
final linkResult = await link(
5656
packageUri,
5757
logger,
5858
dartExecutable,
5959
buildResult: buildResult,
60-
buildAssetTypes: [CodeAsset.type],
60+
buildAssetTypes: [BuildAssetType.code],
6161
);
6262
// Application validation error due to conflicting dylib name.
6363
expect(linkResult, isNull);

‎pkgs/native_assets_builder/test/build_runner/fail_on_os_sdk_version_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void main() async {
7373
packageUri,
7474
createCapturingLogger(logMessages, level: Level.SEVERE),
7575
dartExecutable,
76-
buildAssetTypes: [CodeAsset.type, DataAsset.type],
76+
buildAssetTypes: [BuildAssetType.code, BuildAssetType.data],
7777
);
7878
final fullLog = logMessages.join('\n');
7979
if (hook == 'build') {

‎pkgs/native_assets_builder/test/build_runner/helpers.dart

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Future<BuildResult?> buildDataAssets(
3939
logger,
4040
dartExecutable,
4141
capturedLogs: capturedLogs,
42-
buildAssetTypes: [DataAsset.type],
42+
buildAssetTypes: [BuildAssetType.data],
4343
runPackageName: runPackageName,
4444
linkingEnabled: linkingEnabled,
4545
);
@@ -53,10 +53,12 @@ Future<BuildResult?> buildCodeAssets(
5353
logger,
5454
dartExecutable,
5555
capturedLogs: capturedLogs,
56-
buildAssetTypes: [CodeAsset.type],
56+
buildAssetTypes: [BuildAssetType.code],
5757
runPackageName: runPackageName,
5858
);
5959

60+
enum BuildAssetType { code, data }
61+
6062
Future<BuildResult?> build(
6163
Uri packageUri,
6264
Logger logger,
@@ -71,7 +73,7 @@ Future<BuildResult?> build(
7173
int? targetAndroidNdkApi,
7274
Target? target,
7375
bool linkingEnabled = false,
74-
required List<String> buildAssetTypes,
76+
required List<BuildAssetType> buildAssetTypes,
7577
Map<String, String>? hookEnvironment,
7678
}) async {
7779
final targetOS = target?.os ?? OS.current;
@@ -91,7 +93,7 @@ Future<BuildResult?> build(
9193
packageLayout: packageLayout,
9294
).build(
9395
extensions: [
94-
if (buildAssetTypes.contains(CodeAsset.type))
96+
if (buildAssetTypes.contains(BuildAssetType.code))
9597
CodeAssetExtension(
9698
targetArchitecture: target?.architecture ?? Architecture.current,
9799
targetOS: targetOS,
@@ -115,7 +117,8 @@ Future<BuildResult?> build(
115117
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
116118
: null,
117119
),
118-
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
120+
if (buildAssetTypes.contains(BuildAssetType.data))
121+
DataAssetsExtension(),
119122
],
120123
linkingEnabled: linkingEnabled,
121124
);
@@ -147,7 +150,7 @@ Future<LinkResult?> link(
147150
int? targetMacOSVersion,
148151
int? targetAndroidNdkApi,
149152
Target? target,
150-
required List<String> buildAssetTypes,
153+
required List<BuildAssetType> buildAssetTypes,
151154
}) async {
152155
final targetOS = target?.os ?? OS.current;
153156
final runPackageName_ =
@@ -165,7 +168,7 @@ Future<LinkResult?> link(
165168
packageLayout: packageLayout,
166169
).link(
167170
extensions: [
168-
if (buildAssetTypes.contains(CodeAsset.type))
171+
if (buildAssetTypes.contains(BuildAssetType.code))
169172
CodeAssetExtension(
170173
targetArchitecture: target?.architecture ?? Architecture.current,
171174
targetOS: target?.os ?? OS.current,
@@ -189,7 +192,8 @@ Future<LinkResult?> link(
189192
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
190193
: null,
191194
),
192-
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
195+
if (buildAssetTypes.contains(BuildAssetType.data))
196+
DataAssetsExtension(),
193197
],
194198
buildResult: buildResult,
195199
resourceIdentifiers: resourceIdentifiers,
@@ -218,7 +222,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
218222
int? targetAndroidNdkApi,
219223
Target? target,
220224
Uri? resourceIdentifiers,
221-
required List<String> buildAssetTypes,
225+
required List<BuildAssetType> buildAssetTypes,
222226
}) async => await runWithLog(capturedLogs, () async {
223227
final runPackageName_ =
224228
runPackageName ?? packageUri.pathSegments.lastWhere((e) => e.isNotEmpty);
@@ -236,7 +240,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
236240
final targetOS = target?.os ?? OS.current;
237241
final buildResult = await buildRunner.build(
238242
extensions: [
239-
if (buildAssetTypes.contains(CodeAsset.type))
243+
if (buildAssetTypes.contains(BuildAssetType.code))
240244
CodeAssetExtension(
241245
targetArchitecture: target?.architecture ?? Architecture.current,
242246
targetOS: target?.os ?? OS.current,
@@ -260,7 +264,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
260264
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
261265
: null,
262266
),
263-
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
267+
if (buildAssetTypes.contains(BuildAssetType.data)) DataAssetsExtension(),
264268
],
265269
linkingEnabled: true,
266270
);
@@ -277,7 +281,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
277281

278282
final linkResult = await buildRunner.link(
279283
extensions: [
280-
if (buildAssetTypes.contains(CodeAsset.type))
284+
if (buildAssetTypes.contains(BuildAssetType.code))
281285
CodeAssetExtension(
282286
targetArchitecture: target?.architecture ?? Architecture.current,
283287
targetOS: target?.os ?? OS.current,
@@ -301,7 +305,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
301305
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
302306
: null,
303307
),
304-
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
308+
if (buildAssetTypes.contains(BuildAssetType.data)) DataAssetsExtension(),
305309
],
306310
buildResult: buildResult,
307311
resourceIdentifiers: resourceIdentifiers,

‎pkgs/native_assets_builder/test/build_runner/link_caching_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void main() async {
4242
logger,
4343
dartExecutable,
4444
buildResult: buildResult,
45-
buildAssetTypes: [DataAsset.type],
45+
buildAssetTypes: [BuildAssetType.data],
4646
capturedLogs: logMessages,
4747
))!;
4848
}

0 commit comments

Comments
 (0)