Update minimum macOS version as needed in Swift package (#152347)

If Swift Package Manager is enabled, the tool generates a Swift package at `<ios/macos>/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/`. This Swift package is how the tool adds plugins to the Flutter project.

SwiftPM is strictly enforces platform versions: you cannot depend on a Swift package if its supported version is higher than your own.

On iOS, we use the project's minimum deployment version for the generated Swift package. If a plugin has a higher requirement, you'll need to update your project's minimum deployment version. The generated Swift package is automatically updated the next time you run the tool.

This updates macOS to do the same thing.

Fixes flutter/flutter#146204

Author: loic-sharma

packages/flutter_tools/lib/src/ios/xcodeproj.dart

@@ -195,6 +195,11 @@ class XcodeProjectInterpreter {
     final String? configuration = buildContext.configuration;
     final String? target = buildContext.target;
     final String? deviceId = buildContext.deviceId;
+    final String buildDir = switch (buildContext.sdk) {
+      XcodeSdk.MacOSX => getMacOSBuildDirectory(),
+      XcodeSdk.IPhoneOS || XcodeSdk.IPhoneSimulator => getIosBuildDirectory(),
+      XcodeSdk.WatchOS || XcodeSdk.WatchSimulator => getIosBuildDirectory(),
+    };
     final List<String> showBuildSettingsCommand = <String>[
       ...xcrunCommand(),
       'xcodebuild',
@@ -206,21 +211,20 @@ class XcodeProjectInterpreter {
         ...<String>['-configuration', configuration],
       if (target != null)
         ...<String>['-target', target],
-      if (buildContext.environmentType == EnvironmentType.simulator)
+      if (buildContext.sdk == XcodeSdk.IPhoneSimulator || buildContext.sdk == XcodeSdk.WatchSimulator)
         ...<String>['-sdk', 'iphonesimulator'],
       '-destination',
-      if (buildContext.isWatch && buildContext.environmentType == EnvironmentType.physical)
-        'generic/platform=watchOS'
-      else if (buildContext.isWatch)
-        'generic/platform=watchOS Simulator'
-      else if (deviceId != null)
+      if (deviceId != null)
         'id=$deviceId'
-      else if (buildContext.environmentType == EnvironmentType.physical)
-        'generic/platform=iOS'
-      else
-        'generic/platform=iOS Simulator',
+      else switch (buildContext.sdk) {
+        XcodeSdk.IPhoneOS => 'generic/platform=iOS',
+        XcodeSdk.IPhoneSimulator => 'generic/platform=iOS Simulator',
+        XcodeSdk.MacOSX => 'generic/platform=macOS',
+        XcodeSdk.WatchOS => 'generic/platform=watchOS',
+        XcodeSdk.WatchSimulator => 'generic/platform=watchOS Simulator',
+      },
       '-showBuildSettings',
-      'BUILD_DIR=${_fileSystem.path.absolute(getIosBuildDirectory())}',
+      'BUILD_DIR=${_fileSystem.path.absolute(buildDir)}',
       ...environmentVariablesAsXcodeBuildSettings(_platform),
     ];
     try {
@@ -238,14 +242,19 @@ class XcodeProjectInterpreter {
       return parseXcodeBuildSettings(out);
     } on Exception catch (error) {
       if (error is ProcessException && error.toString().contains('timed out')) {
+        final String eventType = switch (buildContext.sdk) {
+          XcodeSdk.MacOSX => 'macos',
+          XcodeSdk.IPhoneOS || XcodeSdk.IPhoneSimulator => 'ios',
+          XcodeSdk.WatchOS || XcodeSdk.WatchSimulator => 'watchos',
+        };
         BuildEvent('xcode-show-build-settings-timeout',
-          type: 'ios',
+          type: eventType,
           command: showBuildSettingsCommand.join(' '),
           flutterUsage: _usage,
         ).send();
         _analytics.send(Event.flutterBuildInfo(
           label: 'xcode-show-build-settings-timeout',
-          buildType: 'ios',
+          buildType: eventType,
           command: showBuildSettingsCommand.join(' '),
         ));
       }
@@ -394,39 +403,52 @@ String substituteXcodeVariables(String str, Map<String, String> xcodeBuildSettin
   return str.replaceAllMapped(_varExpr, (Match m) => xcodeBuildSettings[m[1]!] ?? m[0]!);
 }
 
+/// Xcode SDKs. Corresponds to undocumented Xcode SUPPORTED_PLATFORMS values.
+/// Use `xcodebuild -showsdks` to get a list of SDKs installed on your machine.
+enum XcodeSdk {
+  IPhoneOS,
+  IPhoneSimulator,
+  MacOSX,
+  WatchOS,
+  WatchSimulator,
+}
+
 @immutable
 class XcodeProjectBuildContext {
   const XcodeProjectBuildContext({
     this.scheme,
     this.configuration,
-    this.environmentType = EnvironmentType.physical,
+    this.sdk = XcodeSdk.IPhoneOS,
     this.deviceId,
     this.target,
-    this.isWatch = false,
   });
 
   final String? scheme;
   final String? configuration;
-  final EnvironmentType environmentType;
+  final XcodeSdk sdk;
   final String? deviceId;
   final String? target;
-  final bool isWatch;
 
   @override
-  int get hashCode => Object.hash(scheme, configuration, environmentType, deviceId, target);
+  int get hashCode => Object.hash(
+    scheme,
+    configuration,
+    sdk,
+    deviceId,
+    target,
+  );
 
   @override
   bool operator ==(Object other) {
     if (identical(other, this)) {
       return true;
     }
     return other is XcodeProjectBuildContext &&
-        other.scheme == scheme &&
-        other.configuration == configuration &&
-        other.deviceId == deviceId &&
-        other.environmentType == environmentType &&
-        other.isWatch == isWatch &&
-        other.target == target;
+      other.scheme == scheme &&
+      other.configuration == configuration &&
+      other.deviceId == deviceId &&
+      other.sdk == sdk &&
+      other.target == target;
   }
 }
 

packages/flutter_tools/lib/src/macos/build_macos.dart

@@ -28,6 +28,7 @@ import 'migrations/macos_deployment_target_migration.dart';
 import 'migrations/nsapplicationmain_deprecation_migration.dart';
 import 'migrations/remove_macos_framework_link_and_embedding_migration.dart';
 import 'migrations/secure_restorable_state_migration.dart';
+import 'swift_package_manager.dart';
 
 /// When run in -quiet mode, Xcode should only print from the underlying tasks to stdout.
 /// Passing this regexp to trace moves the stdout output to stderr.
@@ -108,6 +109,32 @@ Future<void> buildMacOS({
   if (!flutterBuildDir.existsSync()) {
     flutterBuildDir.createSync(recursive: true);
   }
+
+  final Directory xcodeProject = flutterProject.macos.xcodeProject;
+
+  // If the standard project exists, specify it to getInfo to handle the case where there are
+  // other Xcode projects in the macos/ directory. Otherwise pass no name, which will work
+  // regardless of the project name so long as there is exactly one project.
+  final String? xcodeProjectName = xcodeProject.existsSync() ? xcodeProject.basename : null;
+  final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter?.getInfo(
+    xcodeProject.parent.path,
+    projectFilename: xcodeProjectName,
+  );
+  final String? scheme = projectInfo?.schemeFor(buildInfo);
+  if (scheme == null) {
+    projectInfo!.reportFlavorNotFoundAndExit();
+  }
+  final String? configuration = projectInfo?.buildConfigurationFor(buildInfo, scheme);
+  if (configuration == null) {
+    throwToolExit('Unable to find expected configuration in Xcode project.');
+  }
+
+  final Map<String, String> buildSettings = await flutterProject.macos.buildSettingsForBuildInfo(
+    buildInfo,
+    scheme: scheme,
+    configuration: configuration,
+  ) ?? <String, String>{};
+
   // Write configuration to an xconfig file in a standard location.
   await updateGeneratedXcodeProperties(
     project: flutterProject,
@@ -116,9 +143,16 @@ Future<void> buildMacOS({
     useMacOSConfig: true,
   );
 
-  // TODO(vashworth): Call `SwiftPackageManager.updateMinimumDeployment`
-  // using MACOSX_DEPLOYMENT_TARGET once https://github.com/flutter/flutter/issues/146204
-  // is fixed.
+  if (flutterProject.usesSwiftPackageManager) {
+    final String? macOSDeploymentTarget = buildSettings['MACOSX_DEPLOYMENT_TARGET'];
+    if (macOSDeploymentTarget != null) {
+      SwiftPackageManager.updateMinimumDeployment(
+        platform: SupportedPlatform.macos,
+        project: flutterProject.macos,
+        deploymentTarget: macOSDeploymentTarget,
+      );
+    }
+  }
 
   await processPodsIfNeeded(flutterProject.macos, getMacOSBuildDirectory(), buildInfo.mode);
   // If the xcfilelists do not exist, create empty version.
@@ -132,24 +166,6 @@ Future<void> buildMacOS({
     return;
   }
 
-  final Directory xcodeProject = flutterProject.macos.xcodeProject;
-
-  // If the standard project exists, specify it to getInfo to handle the case where there are
-  // other Xcode projects in the macos/ directory. Otherwise pass no name, which will work
-  // regardless of the project name so long as there is exactly one project.
-  final String? xcodeProjectName = xcodeProject.existsSync() ? xcodeProject.basename : null;
-  final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter?.getInfo(
-    xcodeProject.parent.path,
-    projectFilename: xcodeProjectName,
-  );
-  final String? scheme = projectInfo?.schemeFor(buildInfo);
-  if (scheme == null) {
-    projectInfo!.reportFlavorNotFoundAndExit();
-  }
-  final String? configuration = projectInfo?.buildConfigurationFor(buildInfo, scheme);
-  if (configuration == null) {
-    throwToolExit('Unable to find expected configuration in Xcode project.');
-  }
   // Run the Xcode build.
   final Stopwatch sw = Stopwatch()..start();
   final Status status = globals.logger.startProgress(

packages/flutter_tools/lib/src/xcode_project.dart

@@ -155,6 +155,89 @@ abstract class XcodeBasedProject extends FlutterProjectPlatform  {
     return _projectInfo ??= await xcodeProjectInterpreter.getInfo(hostAppRoot.path);
   }
   XcodeProjectInfo? _projectInfo;
+
+  /// The build settings for the host app of this project, as a detached map.
+  ///
+  /// Returns null, if Xcode tooling is unavailable.
+  Future<Map<String, String>?> buildSettingsForBuildInfo(
+    BuildInfo? buildInfo, {
+    String? scheme,
+    String? configuration,
+    String? target,
+    EnvironmentType environmentType = EnvironmentType.physical,
+    String? deviceId,
+    bool isWatch = false,
+  }) async {
+    if (!existsSync()) {
+      return null;
+    }
+    final XcodeProjectInfo? info = await projectInfo();
+    if (info == null) {
+      return null;
+    }
+
+    scheme ??= info.schemeFor(buildInfo);
+    if (scheme == null) {
+      info.reportFlavorNotFoundAndExit();
+    }
+
+    configuration ??= (await projectInfo())?.buildConfigurationFor(
+      buildInfo,
+      scheme,
+    );
+
+    final XcodeSdk sdk = switch ((environmentType, this)) {
+      (EnvironmentType.physical, _) when isWatch => XcodeSdk.WatchOS,
+      (EnvironmentType.simulator, _) when isWatch => XcodeSdk.WatchSimulator,
+      (EnvironmentType.physical, IosProject _) => XcodeSdk.IPhoneOS,
+      (EnvironmentType.simulator, IosProject _) => XcodeSdk.WatchSimulator,
+      (EnvironmentType.physical, MacOSProject _) => XcodeSdk.MacOSX,
+      (_, _) => throw ArgumentError('Unsupported SDK')
+    };
+
+    return _buildSettingsForXcodeProjectBuildContext(
+      XcodeProjectBuildContext(
+        scheme: scheme,
+        configuration: configuration,
+        sdk: sdk,
+        target: target,
+        deviceId: deviceId,
+      ),
+    );
+  }
+
+  Future<Map<String, String>?> _buildSettingsForXcodeProjectBuildContext(XcodeProjectBuildContext buildContext) async {
+    if (!existsSync()) {
+      return null;
+    }
+    final Map<String, String>? currentBuildSettings = _buildSettingsByBuildContext[buildContext];
+    if (currentBuildSettings == null) {
+      final Map<String, String>? calculatedBuildSettings = await _xcodeProjectBuildSettings(buildContext);
+      if (calculatedBuildSettings != null) {
+        _buildSettingsByBuildContext[buildContext] = calculatedBuildSettings;
+      }
+    }
+    return _buildSettingsByBuildContext[buildContext];
+  }
+
+  final Map<XcodeProjectBuildContext, Map<String, String>> _buildSettingsByBuildContext = <XcodeProjectBuildContext, Map<String, String>>{};
+
+  Future<Map<String, String>?> _xcodeProjectBuildSettings(XcodeProjectBuildContext buildContext) async {
+    final XcodeProjectInterpreter? xcodeProjectInterpreter = globals.xcodeProjectInterpreter;
+    if (xcodeProjectInterpreter == null || !xcodeProjectInterpreter.isInstalled) {
+      return null;
+    }
+
+    final Map<String, String> buildSettings = await xcodeProjectInterpreter.getBuildSettings(
+      xcodeProject.path,
+      buildContext: buildContext,
+    );
+    if (buildSettings.isNotEmpty) {
+      // No timeouts, flakes, or errors.
+      return buildSettings;
+    }
+    return null;
+  }
 }
 
 /// Represents the iOS sub-project of a Flutter project.
@@ -424,80 +507,6 @@ class IosProject extends XcodeBasedProject {
     return productName ?? XcodeBasedProject._defaultHostAppName;
   }
 
-  /// The build settings for the host app of this project, as a detached map.
-  ///
-  /// Returns null, if iOS tooling is unavailable.
-  Future<Map<String, String>?> buildSettingsForBuildInfo(
-    BuildInfo? buildInfo, {
-    String? scheme,
-    String? configuration,
-    String? target,
-    EnvironmentType environmentType = EnvironmentType.physical,
-    String? deviceId,
-    bool isWatch = false,
-  }) async {
-    if (!existsSync()) {
-      return null;
-    }
-    final XcodeProjectInfo? info = await projectInfo();
-    if (info == null) {
-      return null;
-    }
-
-    scheme ??= info.schemeFor(buildInfo);
-    if (scheme == null) {
-      info.reportFlavorNotFoundAndExit();
-    }
-
-    configuration ??= (await projectInfo())?.buildConfigurationFor(
-      buildInfo,
-      scheme,
-    );
-    return _buildSettingsForXcodeProjectBuildContext(
-      XcodeProjectBuildContext(
-        environmentType: environmentType,
-        scheme: scheme,
-        configuration: configuration,
-        target: target,
-        deviceId: deviceId,
-        isWatch: isWatch,
-      ),
-    );
-  }
-
-  Future<Map<String, String>?> _buildSettingsForXcodeProjectBuildContext(XcodeProjectBuildContext buildContext) async {
-    if (!existsSync()) {
-      return null;
-    }
-    final Map<String, String>? currentBuildSettings = _buildSettingsByBuildContext[buildContext];
-    if (currentBuildSettings == null) {
-      final Map<String, String>? calculatedBuildSettings = await _xcodeProjectBuildSettings(buildContext);
-      if (calculatedBuildSettings != null) {
-        _buildSettingsByBuildContext[buildContext] = calculatedBuildSettings;
-      }
-    }
-    return _buildSettingsByBuildContext[buildContext];
-  }
-
-  final Map<XcodeProjectBuildContext, Map<String, String>> _buildSettingsByBuildContext = <XcodeProjectBuildContext, Map<String, String>>{};
-
-  Future<Map<String, String>?> _xcodeProjectBuildSettings(XcodeProjectBuildContext buildContext) async {
-    final XcodeProjectInterpreter? xcodeProjectInterpreter = globals.xcodeProjectInterpreter;
-    if (xcodeProjectInterpreter == null || !xcodeProjectInterpreter.isInstalled) {
-      return null;
-    }
-
-    final Map<String, String> buildSettings = await xcodeProjectInterpreter.getBuildSettings(
-      xcodeProject.path,
-      buildContext: buildContext,
-    );
-    if (buildSettings.isNotEmpty) {
-      // No timeouts, flakes, or errors.
-      return buildSettings;
-    }
-    return null;
-  }
-
   Future<void> ensureReadyForPlatformSpecificTooling() async {
     await _regenerateFromTemplateIfNeeded();
     if (!_flutterLibRoot.existsSync()) {