Update minimum macOS version as needed in Swift package #152347

loic-sharma · 2024-07-25T23:03:24Z

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 #146204

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

loic-sharma · 2024-07-25T23:24:40Z

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

+  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.');
+  }


Code above this comment is existing code that was moved up in this method.

Code below this comment is new code that grabs the project's deployment target and uses it to update the generated Swift package.

This mirrors the same logic for iOS.

flutter/packages/flutter_tools/lib/src/ios/mac.dart

Lines 268 to 277 in 978657b

if (project.usesSwiftPackageManager) {

final String? iosDeploymentTarget = buildSettings['IPHONEOS_DEPLOYMENT_TARGET'];

if (iosDeploymentTarget != null) {

SwiftPackageManager.updateMinimumDeployment(

platform: SupportedPlatform.ios,

project: project.ios,

deploymentTarget: iosDeploymentTarget,

);

}

}

(This comment was stolen shamelessly from Jenn)

loic-sharma · 2024-07-25T23:29:04Z

packages/flutter_tools/lib/src/xcode_project.dart

+        configuration: configuration,
+        target: target,
+        deviceId: deviceId,
+        isMacOS: this is MacOSProject,


This method was moved from IosProject to the base class XcodeBasedProject so it can be used by the subclass MacOSProject.

The only change to this method was the addition of this line: isMacOS: this is MacOSProject,

jmagman · 2024-07-25T23:48:33Z

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

    this.environmentType = EnvironmentType.physical,
    this.deviceId,
    this.target,
+    this.isMacOS = false,


Might make sense to instead change environmentType to instead match an enum like xcodebuild -showsdks
iOS, iOS simulator, macOS, etc. I think EnvironmentType is only used for iOS right now so you could change that, but I may be wrong.

Thanks for the suggestion, updated! I'm much happier with how this looks now :)

jmagman

LGTM once the tests are happy, we can iterate on it as needed.

Also, I expect this to make flutter build macos benchmarks regress, fetching the build settings takes some time.
https://flutter-flutter-perf.skia.org/e/?numCommits=10&queries=test%3Dflutter_gallery_macos__compile%26test%3Dbasic_material_app_macos__compile%26test%3Dhello_world_macos__compile&selected=commit%3D41745%26name%3D%252Carch%253Dintel%252Cbranch%253Dmaster%252Cconfig%253Ddefault%252Cdevice_type%253Dnone%252Cdevice_version%253Dnone%252Chost_type%253Dmac%252Csub_result%253Drelease_size_bytes%252Ctest%253Dflutter_gallery_macos__compile%252C

loic-sharma · 2024-07-26T21:55:38Z

I verified that google_sign_in_ios migrated to SPM builds on macOS using this change.

…ter/flutter#152347)

Manual roll requested by [email protected] flutter/flutter@031dc3d...4d12197 2024-07-26 [email protected] further shard Mac tool_integration_tests from 4 to 5 shards (flutter/flutter#152399) 2024-07-26 [email protected] Change flutter_build_with_compilation_error_test to check stdout or stderr (flutter/flutter#152404) 2024-07-26 [email protected] [cupertino/icons.dart] Replace ligature references with characters corresponding to codepoints (flutter/flutter#152387) 2024-07-26 [email protected] Update minimum macOS version as needed in Swift package (flutter/flutter#152347) 2024-07-26 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.25.14 to 3.25.15 (flutter/flutter#152401) 2024-07-26 49699333+dependabot[bot]@users.noreply.github.com Bump ossf/scorecard-action from 2.3.3 to 2.4.0 (flutter/flutter#152400) 2024-07-26 [email protected] Update text_painter.dart (flutter/flutter#152398) 2024-07-26 [email protected] Fix some tests that fail with Swift Package Manager enabled (flutter/flutter#152267) 2024-07-26 [email protected] Reland "Launch DDS from Dart SDK and prepare to serve DevTools from DDS (#146593)" (flutter/flutter#152386) 2024-07-26 [email protected] Make `DragGestureRecognizer` abstract methods public (flutter/flutter#151627) 2024-07-26 [email protected] Fix cursor position when Unicode Zs category is entered in TextField (flutter/flutter#152215) 2024-07-26 [email protected] Roll Flutter Engine from 354abf2800a0 to e28f8755e25b (2 revisions) (flutter/flutter#152388) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

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#146204

Fix the xcodebuild flags mixing up the iOS and watchOS simulators. Confirmed this passed in CI on Xcode 16 beta 5: #152408 Fixes #152983 See also #152347

Fix the xcodebuild flags mixing up the iOS and watchOS simulators. Confirmed this passed in CI on Xcode 16 beta 5: flutter#152408 Fixes flutter#152983 See also flutter#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#146204

Fix the xcodebuild flags mixing up the iOS and watchOS simulators. Confirmed this passed in CI on Xcode 16 beta 5: flutter#152408 Fixes flutter#152983 See also flutter#152347

jmagman and others added 4 commits July 24, 2024 15:26

Update minimum macOS version as needed in Swift package

fa18d73

Test

38797ef

Fix destination parameter

48d4541

Tweak

0a32c71

github-actions bot added platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop labels Jul 25, 2024

loic-sharma changed the title ~~Mac build settings~~ Update minimum macOS version as needed in Swift package Jul 25, 2024

loic-sharma mentioned this pull request Jul 25, 2024

Update minimum macOS version as needed in Swift package #152000

Closed

9 tasks

loic-sharma commented Jul 25, 2024

View reviewed changes

jmagman mentioned this pull request Jul 25, 2024

Specify architecture when building for macOS #148920

Closed

9 tasks

jmagman reviewed Jul 25, 2024

View reviewed changes

Feedback

bb17d46

jmagman approved these changes Jul 26, 2024

View reviewed changes

loic-sharma added 2 commits July 26, 2024 14:03

Add macos build settings test + fix existing tests

ab91a29

Fix more

0923b7e

loic-sharma marked this pull request as ready for review July 26, 2024 21:55

loic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 26, 2024

auto-submit bot merged commit 40843e3 into flutter:master Jul 26, 2024

engine-flutter-autoroll mentioned this pull request Jul 27, 2024

Roll Flutter from 7d5c1c04fb56 to e8d4c98b07f8 (115 revisions) flutter/packages#7227

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 27, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

152face

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 27, 2024

Roll Flutter from 7d5c1c04fb56 to f817e51a3a34 (116 revisions) flutter/packages#7228

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 27, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

5004abf

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 28, 2024

Roll Flutter from 7d5c1c04fb56 to 5efbde1a18ad (119 revisions) flutter/packages#7230

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 28, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

accd88f

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 28, 2024

Roll Flutter from 7d5c1c04fb56 to 5efbde1a18ad (119 revisions) flutter/packages#7231

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 28, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

2a5716c

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 29, 2024

Roll Flutter from 031dc3d156b9 to a7bd806fc7f3 (29 revisions) flutter/packages#7247

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 29, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

d27b6ac

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 29, 2024

Roll Flutter from 031dc3d156b9 to 2e7fa83f6776 (33 revisions) flutter/packages#7251

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 29, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

c27e7ed

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 29, 2024

Roll Flutter from 031dc3d156b9 to 634ff77381c2 (34 revisions) flutter/packages#7252

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 29, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

236eca3

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 30, 2024

Roll Flutter from 031dc3d156b9 to 85960d24b9d2 (49 revisions) flutter/packages#7254

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 30, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

edf852a

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 30, 2024

Roll Flutter from 031dc3d156b9 to 61848a448b08 (50 revisions) flutter/packages#7255

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 30, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

3ec5980

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 30, 2024

Roll Flutter from 031dc3d156b9 to cd60efc618eb (51 revisions) flutter/packages#7256

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 30, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

73825c5

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 30, 2024

Roll Flutter from 031dc3d156b9 to 5a47cfb3b04a (52 revisions) flutter/packages#7257

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 30, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

671768a

…ter/flutter#152347)

engine-flutter-autoroll mentioned this pull request Jul 31, 2024

Manual roll Flutter from 031dc3d156b9 to 4d12197ca68d (12 revisions) flutter/packages#7259

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

784ff16

…ter/flutter#152347)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

055a6b9

…ter/flutter#152347)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

ee388be

…ter/flutter#152347)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

174737c

…ter/flutter#152347)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

49d0fbd

…ter/flutter#152347)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

9a8d911

…ter/flutter#152347)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 31, 2024

40843e3 Update minimum macOS version as needed in Swift package (flut…

1ec182d

…ter/flutter#152347)

auto-submit bot pushed a commit that referenced this pull request Aug 8, 2024

Remove -sdk for watchOS simulator in tool (#152992)

6c3677c

Fix the xcodebuild flags mixing up the iOS and watchOS simulators. Confirmed this passed in CI on Xcode 16 beta 5: #152408 Fixes #152983 See also #152347

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update minimum macOS version as needed in Swift package #152347

Update minimum macOS version as needed in Swift package #152347

Uh oh!

loic-sharma commented Jul 25, 2024 •

edited

Loading

Uh oh!

loic-sharma Jul 25, 2024 •

edited

Loading

Uh oh!

loic-sharma Jul 25, 2024

Uh oh!

jmagman Jul 25, 2024

Uh oh!

loic-sharma Jul 26, 2024 •

edited

Loading

Uh oh!

jmagman left a comment •

edited

Loading

Uh oh!

loic-sharma commented Jul 26, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	if (project.usesSwiftPackageManager) {
	final String? iosDeploymentTarget = buildSettings['IPHONEOS_DEPLOYMENT_TARGET'];
	if (iosDeploymentTarget != null) {
	SwiftPackageManager.updateMinimumDeployment(
	platform: SupportedPlatform.ios,
	project: project.ios,
	deploymentTarget: iosDeploymentTarget,
	);
	}
	}

Update minimum macOS version as needed in Swift package #152347

Update minimum macOS version as needed in Swift package #152347

Uh oh!

Conversation

loic-sharma commented Jul 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

loic-sharma Jul 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

loic-sharma Jul 25, 2024

Choose a reason for hiding this comment

Uh oh!

jmagman Jul 25, 2024

Choose a reason for hiding this comment

Uh oh!

loic-sharma Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmagman left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

loic-sharma commented Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

loic-sharma commented Jul 25, 2024 •

edited

Loading

loic-sharma Jul 25, 2024 •

edited

Loading

loic-sharma Jul 26, 2024 •

edited

Loading

jmagman left a comment •

edited

Loading

loic-sharma commented Jul 26, 2024 •

edited

Loading