Skip to content

Commit e675b19

Browse files
dcharkesdcharkes
committed
remove duplicate param list from setupCodeConfig 
1 parent 590c087 commit e675b19

27 files changed

+110
-118
lines changed

‎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
@@ -32,14 +32,14 @@ void main() async {
3232
final targetOS = OS.current;
3333
const defaultMacOSVersion = 13;
3434
BuildConfigBuilder configCreator() => BuildConfigBuilder()
35-
..setupCodeConfig(
35+
..setupCodeConfig(CodeConfig(
3636
targetArchitecture: Architecture.current,
3737
targetOS: OS.current,
3838
macOSConfig: targetOS == OS.macOS
3939
? MacOSConfig(targetVersion: defaultMacOSVersion)
4040
: null,
4141
linkModePreference: LinkModePreference.dynamic,
42-
);
42+
));
4343

4444
await buildRunner.build(
4545
configCreator: configCreator,

‎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
@@ -26,14 +26,14 @@ void main(List<String> args) async {
2626
// Set up the code config, so that the builds for different targets are
2727
// in different directories.
2828
configCreator: () => BuildConfigBuilder()
29-
..setupCodeConfig(
29+
..setupCodeConfig(CodeConfig(
3030
targetArchitecture: target.architecture,
3131
targetOS: targetOS,
3232
macOSConfig: targetOS == OS.macOS
3333
? MacOSConfig(targetVersion: defaultMacOSVersion)
3434
: null,
3535
linkModePreference: LinkModePreference.dynamic,
36-
),
36+
)),
3737
workingDirectory: packageUri,
3838
linkingEnabled: false,
3939
buildAssetTypes: [DataAsset.type],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ void main(List<String> args) async {
2929
fileSystem: const LocalFileSystem(),
3030
).build(
3131
configCreator: () => BuildConfigBuilder()
32-
..setupCodeConfig(
32+
..setupCodeConfig(CodeConfig(
3333
targetArchitecture: Architecture.current,
3434
targetOS: targetOS,
3535
linkModePreference: LinkModePreference.dynamic,
3636
cCompilerConfig: dartCICompilerConfig,
3737
macOSConfig: targetOS == OS.macOS
3838
? MacOSConfig(targetVersion: defaultMacOSVersion)
3939
: null,
40-
),
40+
)),
4141
workingDirectory: packageUri,
4242
linkingEnabled: false,
4343
buildAssetTypes: [CodeAsset.type, DataAsset.type],

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Future<BuildResult?> build(
6161
configCreator: () {
6262
final configBuilder = BuildConfigBuilder();
6363
if (buildAssetTypes.contains(CodeAsset.type)) {
64-
configBuilder.setupCodeConfig(
64+
configBuilder.setupCodeConfig(CodeConfig(
6565
targetArchitecture: target?.architecture ?? Architecture.current,
6666
targetOS: targetOS,
6767
linkModePreference: linkModePreference,
@@ -79,7 +79,7 @@ Future<BuildResult?> build(
7979
androidConfig: targetOS == OS.android
8080
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
8181
: null,
82-
);
82+
));
8383
}
8484
return configBuilder;
8585
},
@@ -135,7 +135,7 @@ Future<LinkResult?> link(
135135
configCreator: () {
136136
final configBuilder = LinkConfigBuilder();
137137
if (buildAssetTypes.contains(CodeAsset.type)) {
138-
configBuilder.setupCodeConfig(
138+
configBuilder.setupCodeConfig(CodeConfig(
139139
targetArchitecture: target?.architecture ?? Architecture.current,
140140
targetOS: target?.os ?? OS.current,
141141
linkModePreference: linkModePreference,
@@ -153,7 +153,7 @@ Future<LinkResult?> link(
153153
androidConfig: targetOS == OS.android
154154
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
155155
: null,
156-
);
156+
));
157157
}
158158
return configBuilder;
159159
},
@@ -206,7 +206,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
206206
final targetOS = target?.os ?? OS.current;
207207
final buildResult = await buildRunner.build(
208208
configCreator: () => BuildConfigBuilder()
209-
..setupCodeConfig(
209+
..setupCodeConfig(CodeConfig(
210210
targetArchitecture: target?.architecture ?? Architecture.current,
211211
targetOS: targetOS,
212212
linkModePreference: linkModePreference,
@@ -224,7 +224,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
224224
androidConfig: targetOS == OS.android
225225
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
226226
: null,
227-
),
227+
)),
228228
configValidator: buildConfigValidator,
229229
workingDirectory: packageUri,
230230
packageLayout: packageLayout,
@@ -247,7 +247,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
247247

248248
final linkResult = await buildRunner.link(
249249
configCreator: () => LinkConfigBuilder()
250-
..setupCodeConfig(
250+
..setupCodeConfig(CodeConfig(
251251
targetArchitecture: target?.architecture ?? Architecture.current,
252252
targetOS: targetOS,
253253
linkModePreference: linkModePreference,
@@ -265,7 +265,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
265265
androidConfig: targetOS == OS.android
266266
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
267267
: null,
268-
),
268+
)),
269269
configValidator: linkConfigValidator,
270270
workingDirectory: packageUri,
271271
packageLayout: packageLayout,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ void main() async {
4242
outputDirectory: outputDirectory,
4343
outputDirectoryShared: outputDirectoryShared,
4444
)
45-
..setupCodeConfig(
45+
..setupCodeConfig(CodeConfig(
4646
targetArchitecture: Architecture.current,
4747
targetOS: targetOS,
4848
macOSConfig: targetOS == OS.macOS
4949
? MacOSConfig(targetVersion: defaultMacOSVersion)
5050
: null,
5151
linkModePreference: LinkModePreference.dynamic,
5252
cCompilerConfig: cCompiler,
53-
);
53+
));
5454

5555
final buildConfigUri = testTempUri.resolve('build_config.json');
5656
File.fromUri(buildConfigUri)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ void main() async {
5757
outputDirectory: outputDirectory,
5858
outputDirectoryShared: outputDirectoryShared,
5959
)
60-
..setupCodeConfig(
60+
..setupCodeConfig(CodeConfig(
6161
targetArchitecture: architecture,
6262
targetOS: targetOS,
6363
macOSConfig: targetOS == OS.macOS
6464
? MacOSConfig(targetVersion: defaultMacOSVersion)
6565
: null,
6666
linkModePreference: LinkModePreference.dynamic,
67-
);
67+
));
6868

6969
final buildConfigUri = testTempUri.resolve('build_config.json');
7070
File.fromUri(buildConfigUri)

‎pkgs/native_assets_cli/lib/src/code_assets/config.dart

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CodeConfig {
7070

7171
final linkModePreference =
7272
LinkModePreference.fromString(json.string(_linkModePreferenceKey));
73-
final targetArchitecture = !dryRun
73+
final targetArchitecture = dryRun
7474
? null
7575
: Architecture.fromString(json.string(_targetArchitectureKey,
7676
validValues: Architecture.values.map((a) => a.name)));
@@ -81,11 +81,11 @@ class CodeConfig {
8181
};
8282

8383
final iOSConfig =
84-
!dryRun || targetOS != OS.iOS ? null : IOSConfig.fromJson(json);
84+
dryRun || targetOS != OS.iOS ? null : IOSConfig.fromJson(json);
8585
final androidConfig =
86-
!dryRun || targetOS != OS.android ? null : AndroidConfig.fromJson(json);
86+
dryRun || targetOS != OS.android ? null : AndroidConfig.fromJson(json);
8787
final macOSConfig =
88-
!dryRun || targetOS != OS.macOS ? null : MacOSConfig.fromJson(json);
88+
dryRun || targetOS != OS.macOS ? null : MacOSConfig.fromJson(json);
8989

9090
return CodeConfig(
9191
targetArchitecture: targetArchitecture,
@@ -245,33 +245,25 @@ extension type CodeAssetLinkOutputBuilderAdd._(LinkOutputBuilder _output) {
245245

246246
/// Extension to initialize code specific configuration on link/build configs.
247247
extension CodeAssetBuildConfigBuilder on HookConfigBuilder {
248-
void setupCodeConfig({
249-
required Architecture? targetArchitecture,
250-
required OS targetOS,
251-
required LinkModePreference linkModePreference,
252-
CCompilerConfig? cCompilerConfig,
253-
AndroidConfig? androidConfig,
254-
IOSConfig? iOSConfig,
255-
MacOSConfig? macOSConfig,
256-
}) {
257-
if (targetArchitecture != null) {
258-
json[_targetArchitectureKey] = targetArchitecture.toString();
248+
void setupCodeConfig(CodeConfig codeConfig) {
249+
if (codeConfig._targetArchitecture != null) {
250+
json[_targetArchitectureKey] = codeConfig.targetArchitecture.toString();
259251
}
260-
json[_targetOSConfigKey] = targetOS.toString();
261-
json[_linkModePreferenceKey] = linkModePreference.toString();
262-
if (cCompilerConfig != null) {
263-
json[_compilerKey] = cCompilerConfig.toJson();
252+
json[_targetOSConfigKey] = codeConfig.targetOS.toString();
253+
json[_linkModePreferenceKey] = codeConfig.linkModePreference.toString();
254+
if (codeConfig.cCompiler != null) {
255+
json[_compilerKey] = codeConfig.cCompiler?.toJson();
264256
}
265257

266258
// Note, using ?. instead of !. makes missing data be a semantic error
267259
// rather than a syntactic error to be caught in the validation.
268-
if (targetOS == OS.android) {
269-
json[_targetAndroidNdkApiKey] = androidConfig?.targetNdkApi;
270-
} else if (targetOS == OS.iOS) {
271-
json[_targetIOSSdkKey] = iOSConfig?.targetSdk.toString();
272-
json[_targetIOSVersionKey] = iOSConfig?.targetVersion;
273-
} else if (targetOS == OS.macOS) {
274-
json[_targetMacOSVersionKey] = macOSConfig?.targetVersion;
260+
if (codeConfig.targetOS == OS.android) {
261+
json[_targetAndroidNdkApiKey] = codeConfig._androidConfig?.targetNdkApi;
262+
} else if (codeConfig.targetOS == OS.iOS) {
263+
json[_targetIOSSdkKey] = codeConfig._iOSConfig?.targetSdk.toString();
264+
json[_targetIOSVersionKey] = codeConfig._iOSConfig?.targetVersion;
265+
} else if (codeConfig.targetOS == OS.macOS) {
266+
json[_targetMacOSVersionKey] = codeConfig._macOSConfig?.targetVersion;
275267
}
276268
}
277269
}

‎pkgs/native_assets_cli/lib/src/code_assets/testing.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Future<void> testCodeBuildHook({
3838
await testBuildHook(
3939
mainMethod: mainMethod,
4040
extraConfigSetup: (config) {
41-
config.setupCodeConfig(
41+
config.setupCodeConfig(CodeConfig(
4242
linkModePreference: linkModePreference ?? LinkModePreference.dynamic,
4343
cCompilerConfig: cCompiler,
4444
targetArchitecture: targetArchitecture ?? Architecture.current,
@@ -55,7 +55,7 @@ Future<void> testCodeBuildHook({
5555
androidConfig: targetOS == OS.android
5656
? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
5757
: null,
58-
);
58+
));
5959
},
6060
check: (config, output) async {
6161
final validationErrors =

‎pkgs/native_assets_cli/test/checksum_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ void main() {
3131
dryRun: dryRun,
3232
linkingEnabled: linking,
3333
)
34-
..setupCodeConfig(
34+
..setupCodeConfig(CodeConfig(
3535
targetArchitecture: architecture,
3636
targetOS: os,
3737
macOSConfig: os == OS.macOS
3838
? MacOSConfig(targetVersion: defaultMacOSVersion)
3939
: null,
4040
linkModePreference: LinkModePreference.dynamic,
41-
);
41+
));
4242
configs.add(
4343
const JsonEncoder.withIndent(' ').convert(builder.json),
4444
);

‎pkgs/native_assets_cli/test/code_assets/config_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ void main() async {
9999
outputDirectory: outDirUri,
100100
outputDirectoryShared: outputDirectoryShared,
101101
)
102-
..setupCodeConfig(
102+
..setupCodeConfig(CodeConfig(
103103
targetOS: OS.android,
104104
androidConfig: null, // not available in dry run
105105
targetArchitecture: null, // not available in dry run
106106
cCompilerConfig: null, // not available in dry run
107107
linkModePreference: LinkModePreference.preferStatic,
108-
);
108+
));
109109
final config = BuildConfig(configBuilder.json);
110110
expectCorrectCodeConfigDryRun(config.json, config.codeConfig);
111111
});
@@ -125,7 +125,7 @@ void main() async {
125125
outputDirectory: outDirUri,
126126
outputDirectoryShared: outputDirectoryShared,
127127
)
128-
..setupCodeConfig(
128+
..setupCodeConfig(CodeConfig(
129129
targetOS: OS.android,
130130
targetArchitecture: Architecture.arm64,
131131
androidConfig: AndroidConfig(targetNdkApi: 30),
@@ -137,7 +137,7 @@ void main() async {
137137
envScript: fakeVcVars,
138138
envScriptArgs: ['arg0', 'arg1'],
139139
),
140-
);
140+
));
141141
final config = BuildConfig(configBuilder.json);
142142
expectCorrectCodeConfig(config.json, config.codeConfig);
143143
});
@@ -155,7 +155,7 @@ void main() async {
155155
outputDirectoryShared: outputDirectoryShared,
156156
recordedUsesFile: null,
157157
)
158-
..setupCodeConfig(
158+
..setupCodeConfig(CodeConfig(
159159
targetOS: OS.android,
160160
targetArchitecture: Architecture.arm64,
161161
androidConfig: AndroidConfig(targetNdkApi: 30),
@@ -167,7 +167,7 @@ void main() async {
167167
envScript: fakeVcVars,
168168
envScriptArgs: ['arg0', 'arg1'],
169169
),
170-
);
170+
));
171171
final config = LinkConfig(configBuilder.json);
172172
expectCorrectCodeConfig(config.json, config.codeConfig);
173173
expect(config.encodedAssets, assets);

‎pkgs/native_assets_cli/test/code_assets/validation_test.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ void main() {
5151
LinkModePreference linkModePreference = LinkModePreference.dynamic,
5252
}) {
5353
final builder = makeBuildConfigBuilder()
54-
..setupCodeConfig(
54+
..setupCodeConfig(CodeConfig(
5555
targetOS: OS.linux,
5656
targetArchitecture: Architecture.arm64,
5757
linkModePreference: linkModePreference,
58-
);
58+
));
5959
return BuildConfig(builder.json);
6060
}
6161

@@ -217,11 +217,11 @@ void main() {
217217
group('BuildConfig.codeConfig validation', () {
218218
test('Missing targetIOSVersion', () async {
219219
final builder = makeBuildConfigBuilder()
220-
..setupCodeConfig(
220+
..setupCodeConfig(CodeConfig(
221221
targetOS: OS.iOS,
222222
targetArchitecture: Architecture.arm64,
223223
linkModePreference: LinkModePreference.dynamic,
224-
);
224+
));
225225
final errors =
226226
await validateCodeAssetBuildConfig(BuildConfig(builder.json));
227227
expect(
@@ -235,11 +235,11 @@ void main() {
235235
});
236236
test('Missing targetAndroidNdkApi', () async {
237237
final builder = makeBuildConfigBuilder()
238-
..setupCodeConfig(
238+
..setupCodeConfig(CodeConfig(
239239
targetOS: OS.android,
240240
targetArchitecture: Architecture.arm64,
241241
linkModePreference: LinkModePreference.dynamic,
242-
);
242+
));
243243
expect(
244244
await validateCodeAssetBuildConfig(BuildConfig(builder.json)),
245245
contains(contains(
@@ -248,11 +248,11 @@ void main() {
248248
});
249249
test('Missing targetMacOSVersion', () async {
250250
final builder = makeBuildConfigBuilder()
251-
..setupCodeConfig(
251+
..setupCodeConfig(CodeConfig(
252252
targetOS: OS.macOS,
253253
targetArchitecture: Architecture.arm64,
254254
linkModePreference: LinkModePreference.dynamic,
255-
);
255+
));
256256
expect(
257257
await validateCodeAssetBuildConfig(BuildConfig(builder.json)),
258258
contains(contains(
@@ -261,7 +261,7 @@ void main() {
261261
test('Nonexisting compiler/archiver/linker/envScript', () async {
262262
final nonExistent = outDirUri.resolve('foo baz');
263263
final builder = makeBuildConfigBuilder()
264-
..setupCodeConfig(
264+
..setupCodeConfig(CodeConfig(
265265
targetOS: OS.linux,
266266
targetArchitecture: Architecture.arm64,
267267
linkModePreference: LinkModePreference.dynamic,
@@ -270,7 +270,7 @@ void main() {
270270
linker: nonExistent,
271271
archiver: nonExistent,
272272
envScript: nonExistent,
273-
));
273+
)));
274274
final errors =
275275
await validateCodeAssetBuildConfig(BuildConfig(builder.json));
276276

0 commit comments

Comments
 (0)