More test updates regarding `targetMacOSVersion must be set iff targe…

…tOS==MacOS` requirement
dart-lang · Oct 15, 2024 · 2ade85b · 2ade85b
1 parent 5b32ae8
commit 2ade85b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/pkgs/native_assets_builder/test/build_runner/concurrency_test_helper.dart b/pkgs/native_assets_builder/test/build_runner/concurrency_test_helper.dart
@@ -30,6 +30,7 @@ void main(List<String> args) async {
         targetArchitecture: Architecture.current,
         linkModePreference: LinkModePreference.dynamic,
         cCompilerConfig: dartCICompilerConfig,
+        targetMacOSVersion: OS.current == OS.macOS ? defaultMacOSVersion : null,
       ),
     buildMode: BuildMode.release,
     targetOS: OS.current,

diff --git a/pkgs/native_assets_builder/test/build_runner/helpers.dart b/pkgs/native_assets_builder/test/build_runner/helpers.dart
@@ -55,17 +55,22 @@ Future<BuildResult?> build(
       logger: logger,
       dartExecutable: dartExecutable,
     ).build(
-      configCreator: () => BuildConfigBuilder()
-        ..setupCodeConfig(
-          targetArchitecture: target?.architecture ?? Architecture.current,
-          linkModePreference: linkModePreference,
-          cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
-          targetIOSSdk: targetIOSSdk,
-          targetIOSVersion: targetIOSVersion,
-          targetMacOSVersion: targetMacOSVersion ??
-              (targetOS == OS.macOS ? _defaultMacOSVersion : null),
-          targetAndroidNdkApi: targetAndroidNdkApi,
-        ),
+      configCreator: () {
+        final configBuilder = BuildConfigBuilder();
+        if (supportedAssetTypes.contains(CodeAsset.type)) {
+          configBuilder.setupCodeConfig(
+            targetArchitecture: target?.architecture ?? Architecture.current,
+            linkModePreference: linkModePreference,
+            cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
+            targetIOSSdk: targetIOSSdk,
+            targetIOSVersion: targetIOSVersion,
+            targetMacOSVersion: targetMacOSVersion ??
+                (targetOS == OS.macOS ? defaultMacOSVersion : null),
+            targetAndroidNdkApi: targetAndroidNdkApi,
+          );
+        }
+        return configBuilder;
+      },
       configValidator: configValidator,
       buildMode: BuildMode.release,
       targetOS: targetOS,
@@ -118,17 +123,22 @@ Future<LinkResult?> link(
       logger: logger,
       dartExecutable: dartExecutable,
     ).link(
-      configCreator: () => LinkConfigBuilder()
-        ..setupCodeConfig(
-          targetArchitecture: target?.architecture ?? Architecture.current,
-          linkModePreference: linkModePreference,
-          cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
-          targetIOSSdk: targetIOSSdk,
-          targetIOSVersion: targetIOSVersion,
-          targetMacOSVersion: targetMacOSVersion ??
-              (targetOS == OS.macOS ? _defaultMacOSVersion : null),
-          targetAndroidNdkApi: targetAndroidNdkApi,
-        ),
+      configCreator: () {
+        final configBuilder = LinkConfigBuilder();
+        if (supportedAssetTypes.contains(CodeAsset.type)) {
+          configBuilder.setupCodeConfig(
+            targetArchitecture: target?.architecture ?? Architecture.current,
+            linkModePreference: linkModePreference,
+            cCompilerConfig: cCompilerConfig ?? dartCICompilerConfig,
+            targetIOSSdk: targetIOSSdk,
+            targetIOSVersion: targetIOSVersion,
+            targetMacOSVersion: targetMacOSVersion ??
+                (targetOS == OS.macOS ? defaultMacOSVersion : null),
+            targetAndroidNdkApi: targetAndroidNdkApi,
+          );
+        }
+        return configBuilder;
+      },
       configValidator: configValidator,
       buildMode: BuildMode.release,
       targetOS: target?.os ?? OS.current,
@@ -350,4 +360,4 @@ final CCompilerConfig? dartCICompilerConfig = (() {
   return null;
 })();
 
-int _defaultMacOSVersion = 13;
+int defaultMacOSVersion = 13;