Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Xcode projects last version checks to Xcode 14.3 #125827

Merged
merged 1 commit into from May 2, 2023

Conversation

jmagman
Copy link
Member

@jmagman jmagman commented May 1, 2023

  1. Add iOS and macOS migration to mark "last upgraded" Xcode version to 14.3 to prevent Update to recommended settings warning.
  2. Update iOS and macOS templates to same.
  3. Update iOS template to set BuildIndependentTargetsInParallel to YES as suggested. I didn't add a migration for this since it seems like a minor optimization and I don't think it's worth a potentially botched/corrupted migration.
  4. Run all example/integration test project to see migrator work.
  5. Add some missing test projects to the build shard since I noticed they were missing and I had to build those manually outside SHARD=build_tests.

Fixes #125817
See #90304 for Xcode 13 example.

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.
  • All existing and new tests are passing.

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

@jmagman jmagman added platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. platform-mac Building on or for macOS specifically t: xcode "xcodebuild" on iOS and general Xcode project management labels May 1, 2023
@jmagman jmagman self-assigned this May 1, 2023
@flutter-dashboard flutter-dashboard bot added d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos documentation framework flutter/packages/flutter repository. See also f: labels. f: integration_test The flutter/packages/integration_test plugin team Infra upgrades, team productivity, code health, technical debt. See also team: labels. labels May 1, 2023
Comment on lines +546 to +549
..add(Directory(path.join(flutterRoot, 'dev', 'integration_tests', 'ios_app_with_extensions')))
..add(Directory(path.join(flutterRoot, 'dev', 'integration_tests', 'non_nullable')))
..add(Directory(path.join(flutterRoot, 'dev', 'integration_tests', 'platform_interaction')))
..add(Directory(path.join(flutterRoot, 'dev', 'integration_tests', 'spell_check')))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add these integration test projects to build in presubmit.

// Value has been 0730, 0800, 1020, and 1300 in the template.
RegExp(r'LastUpgradeCheck = \d+;'): 'LastUpgradeCheck = 1300;',
// Value has been 0730, 0800, 1020, 1300, and 1430 in the template.
RegExp(r'LastUpgradeCheck = \d+;'): 'LastUpgradeCheck = 1430;',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the migration change.

@@ -186,7 +186,8 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
BuildIndependentTargetsInParallel = YES;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added to iOS template but not migration.

@@ -227,7 +227,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if BuildIndependentTargetsInParallel was needed for macOS template, there was no prompt in Xcode to turn it on. Skip it.

@jmagman jmagman marked this pull request as ready for review May 1, 2023 19:42
Copy link
Contributor

@vashworth vashworth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
08DF46C1ECE03723F402A526 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49B50C6BD3C1A11B60BCFF13 /* libPods-Runner.a */; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I be reviewing this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like spell_check wasn't checked in after being built? Anyway I built it and CocoaPods and Xcode wanted this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

word

Copy link
Member

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label May 1, 2023
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@auto-submit auto-submit bot merged commit 1861ac4 into flutter:master May 2, 2023
137 checks passed
auto-submit bot pushed a commit to flutter/packages that referenced this pull request May 2, 2023
flutter/flutter@828a040...db6074a

2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 46d5ce4784b8 to 44376e8cd3de (1 revision) (flutter/flutter#125876)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from a687d62ff631 to 46d5ce4784b8 (1 revision) (flutter/flutter#125874)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from d0ed35b7bf67 to a687d62ff631 (1 revision) (flutter/flutter#125871)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from c0d68c36c376 to d0ed35b7bf67 (1 revision) (flutter/flutter#125870)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from a9e38dd0510d to c0d68c36c376 (1 revision) (flutter/flutter#125868)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 024bf946232d to a9e38dd0510d (2 revisions) (flutter/flutter#125866)
2023-05-02 caseycrogers@berkeley.edu Make `future` and `stream` required arguments in their respective builder widgets (flutter/flutter#125838)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7d87410a51d5 to 024bf946232d (6 revisions) (flutter/flutter#125858)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 3fa6084dfb36 to 7d87410a51d5 (4 revisions) (flutter/flutter#125845)
2023-05-02 magder@google.com Migrate Xcode projects last version checks to Xcode 14.3 (flutter/flutter#125827)
2023-05-01 engine-flutter-autoroll@skia.org Roll Flutter Engine from 58cc54197a54 to 3fa6084dfb36 (1 revision) (flutter/flutter#125839)
2023-05-01 engine-flutter-autoroll@skia.org Roll Flutter Engine from 687f4c761db1 to 58cc54197a54 (6 revisions) (flutter/flutter#125833)

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 rmistry@google.com,stuartmorgan@google.com,tarrinneal@google.com 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@jmagman jmagman deleted the ios-project-recommend branch May 2, 2023 17:54
joshpetit pushed a commit to joshpetit/packages that referenced this pull request May 2, 2023
…r#3881)

flutter/flutter@828a040...db6074a

2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 46d5ce4784b8 to 44376e8cd3de (1 revision) (flutter/flutter#125876)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from a687d62ff631 to 46d5ce4784b8 (1 revision) (flutter/flutter#125874)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from d0ed35b7bf67 to a687d62ff631 (1 revision) (flutter/flutter#125871)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from c0d68c36c376 to d0ed35b7bf67 (1 revision) (flutter/flutter#125870)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from a9e38dd0510d to c0d68c36c376 (1 revision) (flutter/flutter#125868)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 024bf946232d to a9e38dd0510d (2 revisions) (flutter/flutter#125866)
2023-05-02 caseycrogers@berkeley.edu Make `future` and `stream` required arguments in their respective builder widgets (flutter/flutter#125838)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7d87410a51d5 to 024bf946232d (6 revisions) (flutter/flutter#125858)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 3fa6084dfb36 to 7d87410a51d5 (4 revisions) (flutter/flutter#125845)
2023-05-02 magder@google.com Migrate Xcode projects last version checks to Xcode 14.3 (flutter/flutter#125827)
2023-05-01 engine-flutter-autoroll@skia.org Roll Flutter Engine from 58cc54197a54 to 3fa6084dfb36 (1 revision) (flutter/flutter#125839)
2023-05-01 engine-flutter-autoroll@skia.org Roll Flutter Engine from 687f4c761db1 to 58cc54197a54 (6 revisions) (flutter/flutter#125833)

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 rmistry@google.com,stuartmorgan@google.com,tarrinneal@google.com 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
nploi pushed a commit to nploi/packages that referenced this pull request Jul 16, 2023
…r#3881)

flutter/flutter@828a040...db6074a

2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 46d5ce4784b8 to 44376e8cd3de (1 revision) (flutter/flutter#125876)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from a687d62ff631 to 46d5ce4784b8 (1 revision) (flutter/flutter#125874)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from d0ed35b7bf67 to a687d62ff631 (1 revision) (flutter/flutter#125871)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from c0d68c36c376 to d0ed35b7bf67 (1 revision) (flutter/flutter#125870)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from a9e38dd0510d to c0d68c36c376 (1 revision) (flutter/flutter#125868)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 024bf946232d to a9e38dd0510d (2 revisions) (flutter/flutter#125866)
2023-05-02 caseycrogers@berkeley.edu Make `future` and `stream` required arguments in their respective builder widgets (flutter/flutter#125838)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7d87410a51d5 to 024bf946232d (6 revisions) (flutter/flutter#125858)
2023-05-02 engine-flutter-autoroll@skia.org Roll Flutter Engine from 3fa6084dfb36 to 7d87410a51d5 (4 revisions) (flutter/flutter#125845)
2023-05-02 magder@google.com Migrate Xcode projects last version checks to Xcode 14.3 (flutter/flutter#125827)
2023-05-01 engine-flutter-autoroll@skia.org Roll Flutter Engine from 58cc54197a54 to 3fa6084dfb36 (1 revision) (flutter/flutter#125839)
2023-05-01 engine-flutter-autoroll@skia.org Roll Flutter Engine from 687f4c761db1 to 58cc54197a54 (6 revisions) (flutter/flutter#125833)

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 rmistry@google.com,stuartmorgan@google.com,tarrinneal@google.com 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App d: api docs Issues with https://api.flutter.dev/ d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin framework flutter/packages/flutter repository. See also f: labels. platform-ios iOS applications specifically platform-mac Building on or for macOS specifically t: xcode "xcodebuild" on iOS and general Xcode project management team Infra upgrades, team productivity, code health, technical debt. See also team: labels. tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Newly created iOS project has "Update to recommended settings" warning in Xcode 14.3
4 participants