Skip to content

Commit 92e25c2

Browse files
dcharkesdcharkes
committed
[native_assets_cli] Drop Config suffixes v1
1 parent 8c16b6c commit 92e25c2

File tree

71 files changed

+482
-530
lines changed

Some content is hidden

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

71 files changed

+482
-530
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ class NativeAssetsBuildRunner {
119119
)?.forEach((key, value) => metadata[key] = value);
120120

121121
final configBuilder = configCreator()
122-
..setupHookConfig(
122+
..setupHook(
123123
buildAssetTypes: buildAssetTypes,
124124
packageName: package.name,
125125
packageRoot: packageLayout.packageRoot(package.name),
126126
)
127-
..setupBuildConfig(
127+
..setupBuild(
128128
dryRun: false,
129129
linkingEnabled: linkingEnabled,
130130
metadata: metadata,
@@ -137,7 +137,7 @@ class NativeAssetsBuildRunner {
137137
package,
138138
);
139139

140-
configBuilder.setupBuildRunConfig(
140+
configBuilder.setupBuildAfterChecksum(
141141
outputDirectory: outDirUri,
142142
outputDirectoryShared: outDirSharedUri,
143143
);
@@ -216,7 +216,7 @@ class NativeAssetsBuildRunner {
216216
var hookResult = HookResult(encodedAssets: buildResult.encodedAssets);
217217
for (final package in buildPlan) {
218218
final configBuilder = configCreator()
219-
..setupHookConfig(
219+
..setupHook(
220220
buildAssetTypes: buildAssetTypes,
221221
packageName: package.name,
222222
packageRoot: packageLayout.packageRoot(package.name),
@@ -235,7 +235,7 @@ class NativeAssetsBuildRunner {
235235
await resourcesFile.create();
236236
await File.fromUri(resourceIdentifiers).copy(resourcesFile.path);
237237
}
238-
configBuilder.setupLinkRunConfig(
238+
configBuilder.setupLinkAfterChecksum(
239239
outputDirectory: outDirUri,
240240
outputDirectoryShared: outDirSharedUri,
241241
recordedUsesFile: resourcesFile?.uri,

‎pkgs/native_assets_builder/lib/src/model/hook_result.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ final class HookResult implements BuildResult, LinkResult {
5050
...encodedAssets2,
5151
]);
5252
final hookOutputAssets = (hookOutput is BuildOutput)
53-
? hookOutput.encodedAssets
54-
: (hookOutput as LinkOutput).encodedAssets;
53+
? hookOutput.assets
54+
: (hookOutput as LinkOutput).assets;
5555
return HookResult(
5656
encodedAssets: [
5757
...encodedAssets,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ void main() async {
3030
final targetOS = OS.current;
3131
const defaultMacOSVersion = 13;
3232
BuildConfigBuilder configCreator() => BuildConfigBuilder()
33-
..setupCodeConfig(
33+
..setupCode(
3434
targetArchitecture: Architecture.current,
3535
targetOS: OS.current,
36-
macOSConfig: targetOS == OS.macOS
36+
macOS: targetOS == OS.macOS
3737
? MacOSConfig(targetVersion: defaultMacOSVersion)
3838
: null,
3939
linkModePreference: LinkModePreference.dynamic,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ void main(List<String> args) async {
2424
// Set up the code config, so that the builds for different targets are
2525
// in different directories.
2626
configCreator: () => BuildConfigBuilder()
27-
..setupCodeConfig(
27+
..setupCode(
2828
targetArchitecture: target.architecture,
2929
targetOS: targetOS,
30-
macOSConfig: targetOS == OS.macOS
30+
macOS: targetOS == OS.macOS
3131
? MacOSConfig(targetVersion: defaultMacOSVersion)
3232
: null,
3333
linkModePreference: LinkModePreference.dynamic,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ void main(List<String> args) async {
2727
singleHookTimeout: timeout,
2828
).build(
2929
configCreator: () => BuildConfigBuilder()
30-
..setupCodeConfig(
30+
..setupCode(
3131
targetArchitecture: Architecture.current,
3232
targetOS: targetOS,
3333
linkModePreference: LinkModePreference.dynamic,
34-
cCompilerConfig: dartCICompilerConfig,
35-
macOSConfig: targetOS == OS.macOS
34+
cCompiler: dartCICompilerConfig,
35+
macOS: targetOS == OS.macOS
3636
? MacOSConfig(targetVersion: defaultMacOSVersion)
3737
: null,
3838
),

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@ Future<BuildResult?> build(
5757
configCreator: () {
5858
final configBuilder = BuildConfigBuilder();
5959
if (buildAssetTypes.contains(CodeAsset.type)) {
60-
configBuilder.setupCodeConfig(
60+
configBuilder.setupCode(
6161
targetArchitecture: target?.architecture ?? Architecture.current,
6262
targetOS: targetOS,
6363
linkModePreference: linkModePreference,
64-
cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
65-
iOSConfig: targetOS == OS.iOS
64+
cCompiler: cCompilerConfig ?? dartCICompilerConfig,
65+
iOS: targetOS == OS.iOS
6666
? IOSConfig(
6767
targetSdk: targetIOSSdk!,
6868
targetVersion: targetIOSVersion!,
6969
)
7070
: null,
71-
macOSConfig: targetOS == OS.macOS
71+
macOS: targetOS == OS.macOS
7272
? MacOSConfig(
7373
targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
7474
: null,
75-
androidConfig: targetOS == OS.android
75+
android: targetOS == OS.android
7676
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
7777
: null,
7878
);
@@ -130,22 +130,22 @@ Future<LinkResult?> link(
130130
configCreator: () {
131131
final configBuilder = LinkConfigBuilder();
132132
if (buildAssetTypes.contains(CodeAsset.type)) {
133-
configBuilder.setupCodeConfig(
133+
configBuilder.setupCode(
134134
targetArchitecture: target?.architecture ?? Architecture.current,
135135
targetOS: target?.os ?? OS.current,
136136
linkModePreference: linkModePreference,
137-
cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
138-
iOSConfig: targetOS == OS.iOS
137+
cCompiler: cCompilerConfig ?? dartCICompilerConfig,
138+
iOS: targetOS == OS.iOS
139139
? IOSConfig(
140140
targetSdk: targetIOSSdk!,
141141
targetVersion: targetIOSVersion!,
142142
)
143143
: null,
144-
macOSConfig: targetOS == OS.macOS
144+
macOS: targetOS == OS.macOS
145145
? MacOSConfig(
146146
targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
147147
: null,
148-
androidConfig: targetOS == OS.android
148+
android: targetOS == OS.android
149149
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
150150
: null,
151151
);
@@ -200,22 +200,22 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
200200
final targetOS = target?.os ?? OS.current;
201201
final buildResult = await buildRunner.build(
202202
configCreator: () => BuildConfigBuilder()
203-
..setupCodeConfig(
203+
..setupCode(
204204
targetArchitecture: target?.architecture ?? Architecture.current,
205205
targetOS: targetOS,
206206
linkModePreference: linkModePreference,
207-
cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
208-
iOSConfig: targetOS == OS.iOS
207+
cCompiler: cCompilerConfig ?? dartCICompilerConfig,
208+
iOS: targetOS == OS.iOS
209209
? IOSConfig(
210210
targetSdk: targetIOSSdk!,
211211
targetVersion: targetIOSVersion!,
212212
)
213213
: null,
214-
macOSConfig: targetOS == OS.macOS
214+
macOS: targetOS == OS.macOS
215215
? MacOSConfig(
216216
targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
217217
: null,
218-
androidConfig: targetOS == OS.android
218+
android: targetOS == OS.android
219219
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
220220
: null,
221221
),
@@ -241,22 +241,22 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
241241

242242
final linkResult = await buildRunner.link(
243243
configCreator: () => LinkConfigBuilder()
244-
..setupCodeConfig(
244+
..setupCode(
245245
targetArchitecture: target?.architecture ?? Architecture.current,
246246
targetOS: targetOS,
247247
linkModePreference: linkModePreference,
248-
cCompilerConfig: cCompilerConfig,
249-
iOSConfig: targetOS == OS.iOS
248+
cCompiler: cCompilerConfig,
249+
iOS: targetOS == OS.iOS
250250
? IOSConfig(
251251
targetSdk: targetIOSSdk!,
252252
targetVersion: targetIOSVersion!,
253253
)
254254
: null,
255-
macOSConfig: targetOS == OS.macOS
255+
macOS: targetOS == OS.macOS
256256
? MacOSConfig(
257257
targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
258258
: null,
259-
androidConfig: targetOS == OS.android
259+
android: targetOS == OS.android
260260
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
261261
: null,
262262
),

‎pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ void main() async {
3232

3333
final targetOS = OS.current;
3434
final configBuilder = BuildConfigBuilder()
35-
..setupHookConfig(
35+
..setupHook(
3636
packageName: name,
3737
packageRoot: testPackageUri,
3838
buildAssetTypes: [CodeAsset.type],
3939
)
40-
..setupBuildConfig(dryRun: false, linkingEnabled: false)
41-
..setupBuildRunConfig(
40+
..setupBuild(dryRun: false, linkingEnabled: false)
41+
..setupBuildAfterChecksum(
4242
outputDirectory: outputDirectory,
4343
outputDirectoryShared: outputDirectoryShared,
4444
)
45-
..setupCodeConfig(
45+
..setupCode(
4646
targetArchitecture: Architecture.current,
4747
targetOS: targetOS,
48-
macOSConfig: targetOS == OS.macOS
48+
macOS: targetOS == OS.macOS
4949
? MacOSConfig(targetVersion: defaultMacOSVersion)
5050
: null,
5151
linkModePreference: LinkModePreference.dynamic,
52-
cCompilerConfig: cCompiler,
52+
cCompiler: cCompiler,
5353
);
5454

5555
final buildConfigUri = testTempUri.resolve('build_config.json');
@@ -75,7 +75,7 @@ void main() async {
7575
final buildOutput = BuildOutput(
7676
json.decode(await File.fromUri(buildOutputUri).readAsString())
7777
as Map<String, Object?>);
78-
final assets = buildOutput.encodedAssets;
78+
final assets = buildOutput.assets;
7979
final dependencies = buildOutput.dependencies;
8080

8181
expect(assets.length, 3);

‎pkgs/native_assets_builder/test/test_data/transformer_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ void main() async {
4747
final targetOS = OS.current;
4848
Future<void> runBuild(Architecture architecture) async {
4949
final configBuilder = BuildConfigBuilder()
50-
..setupHookConfig(
50+
..setupHook(
5151
packageName: packageName,
5252
packageRoot: packageUri,
5353
buildAssetTypes: [DataAsset.type],
5454
)
55-
..setupBuildConfig(dryRun: false, linkingEnabled: false)
56-
..setupBuildRunConfig(
55+
..setupBuild(dryRun: false, linkingEnabled: false)
56+
..setupBuildAfterChecksum(
5757
outputDirectory: outputDirectory,
5858
outputDirectoryShared: outputDirectoryShared,
5959
)
60-
..setupCodeConfig(
60+
..setupCode(
6161
targetArchitecture: architecture,
6262
targetOS: targetOS,
63-
macOSConfig: targetOS == OS.macOS
63+
macOS: targetOS == OS.macOS
6464
? MacOSConfig(targetVersion: defaultMacOSVersion)
6565
: null,
6666
linkModePreference: LinkModePreference.dynamic,
@@ -101,7 +101,7 @@ void main() async {
101101
]),
102102
);
103103
expect(
104-
output.dataAssets,
104+
output.assets.data,
105105
contains(
106106
DataAsset(
107107
file: outputDirectoryShared.resolve('data_transformed0.json'),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import 'package:native_assets_cli/code_assets.dart';
66

77
void main(List<String> arguments) async {
88
await link(arguments, (config, output) async {
9-
final builtDylib = config.codeAssets.first;
9+
final builtDylib = config.assets.code.first;
1010
output
11-
..codeAssets.add(
11+
..code.addAsset(
1212
CodeAsset(
1313
package: 'add_asset_link',
1414
name: 'dylib_add_link',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void main(List<String> args) async {
2424
.toFilePath(windows: false)
2525
.substring(config.packageRoot.toFilePath(windows: false).length);
2626

27-
output.dataAssets.add(
27+
output.data.addAsset(
2828
DataAsset(
2929
package: packageName,
3030
name: name,

‎pkgs/native_assets_builder/test_data/complex_link/hook/link.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ void main(List<String> args) async {
88
await link(
99
args,
1010
(config, output) async =>
11-
output.dataAssets.addAll(treeshake(config.dataAssets)),
11+
output.data.addAssets(treeshake(config.assets.data)),
1212
);
1313
}
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void main(List<String> args) async {
2525
.substring(config.packageRoot.toFilePath(windows: false).length);
2626

2727
final forLinking = name.contains('2') || name.contains('3');
28-
output.dataAssets.add(
28+
output.data.addAsset(
2929
DataAsset(
3030
package: packageName,
3131
name: name,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import 'package:native_assets_cli/code_assets.dart';
66

77
void main(List<String> arguments) async {
88
await link(arguments, (config, output) async {
9-
for (final codeAsset in config.codeAssets) {
9+
for (final codeAsset in config.assets.code) {
1010
print('Got code asset: ${codeAsset.id}');
1111
if (codeAsset.id.endsWith('add')) {
12-
output.codeAssets.add(codeAsset);
12+
output.code.addAsset(codeAsset);
1313
print('-> Keeping ${codeAsset.id}');
1414
} else {
1515
print('-> Dropping ${codeAsset.id}');

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,24 @@ const minMacOSVersionForThisPackage = 13;
1414

1515
void main(List<String> arguments) async {
1616
await build(arguments, (config, output) async {
17-
if (config.codeConfig.targetOS == OS.android) {
18-
if (config.codeConfig.androidConfig.targetNdkApi <
19-
minNdkApiVersionForThisPackage) {
17+
if (config.code.targetOS == OS.android) {
18+
if (config.code.android.targetNdkApi < minNdkApiVersionForThisPackage) {
2019
throw UnsupportedError(
2120
'The native assets for this package require at '
2221
'least Android NDK API level $minNdkApiVersionForThisPackage.',
2322
);
2423
}
25-
} else if (config.codeConfig.targetOS == OS.iOS) {
26-
final iosVersion = config.codeConfig.iOSConfig.targetVersion;
24+
} else if (config.code.targetOS == OS.iOS) {
25+
final iosVersion = config.code.iOS.targetVersion;
2726
// iosVersion is nullable to deal with version skew.
2827
if (iosVersion < minIosVersionForThisPackage) {
2928
throw UnsupportedError(
3029
'The native assets for this package require at '
3130
'least iOS version $minIosVersionForThisPackage.',
3231
);
3332
}
34-
} else if (config.codeConfig.targetOS == OS.macOS) {
35-
final macosVersion = config.codeConfig.macOSConfig.targetVersion;
33+
} else if (config.code.targetOS == OS.macOS) {
34+
final macosVersion = config.code.macOS.targetVersion;
3635
// macosVersion is nullable to deal with version skew.
3736
if (macosVersion < minMacOSVersionForThisPackage) {
3837
throw UnsupportedError(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:native_assets_cli/data_assets.dart';
66

77
void main(List<String> arguments) async {
88
await build(arguments, (config, output) async {
9-
output.dataAssets.add(
9+
output.data.addAsset(
1010
DataAsset(
1111
name: 'data',
1212
file: config.packageRoot.resolve('assets/data.json'),

0 commit comments

Comments
 (0)