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

[macOS,iOS] CocoaPods recommended version: 1.13.0 #135447

Merged
merged 2 commits into from
Dec 15, 2023

Conversation

cbracken
Copy link
Member

Due to changes in Xcode 15, several variables such as DT_TOOLCHAIN_DIR have been eliminateed in favour of others such as TOOLCHAIN_DIR. This broke CocoaPods support under Xcode 15, as reported in: CocoaPods/CocoaPods#12012

@vashworth worked around this in Flutter in:
#132803

The CocoaPods issue was resolved by the following PR to their repo: CocoaPods/CocoaPods#12009
and was released in CocoaPods 1.13.0.

Also switches from an if-else chain to a switch for CocoaPodsStatus handling.

Related: #133584
Related: #132755

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.

@github-actions github-actions bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop labels Sep 25, 2023
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.

The code LGTM, but I don't know that we should recommend a new version without running our CI against it first.

@vashworth
Copy link
Contributor

There's an outstanding issue for upgrading our CI to 1.12.1 #133096, which was blocked by #122057

@cbracken
Copy link
Member Author

Yes - we should definitely update CI before landing this.

@cbracken
Copy link
Member Author

cbracken commented Sep 25, 2023

Actually, what I'll do to minimise this patch is separate out the refactor to using a case statement and adding the upgrade string from the actual version bump. When the next version bump comes along, whoever does it would probably appreciate having the previous patch as minimal as possible.

I've sent out #135453 for the refactor and rebased this on top of it.

@cbracken cbracken force-pushed the cocoapods-version-bump branch 2 times, most recently from 00e89a0 to f1e8108 Compare September 26, 2023 16:38
Due to changes in Xcode 15, several variables such as `DT_TOOLCHAIN_DIR`
have been eliminateed in favour of others such as `TOOLCHAIN_DIR`. This
broke CocoaPods support under Xcode 15, as reported in:
CocoaPods/CocoaPods#12012

@vashworth worked around this in Flutter in:
flutter#132803

The CocoaPods issue was resolved by the following PR to their repo:
CocoaPods/CocoaPods#12009
and was released in CocoaPods 1.13.0.

Also switches from an if-else chain to a switch for CocoaPodsStatus
handling.

Issue: flutter#133584
Related: flutter#132755
@christopherfujino
Copy link
Member

I believe this is blocked on updating the way we get ruby on our mac bots

@cbracken
Copy link
Member Author

Yep - that, and then updating our own bots is what this is waiting on.

@gspencergoog
Copy link
Contributor

@godofredoc What is the status of updating Cocoapods on the bots? (Desktop Triage)

@christopherfujino
Copy link
Member

@cbracken I think we're unblocked after #136929

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

@cbracken cbracken merged commit d0670f0 into flutter:master Dec 15, 2023
121 checks passed
@cbracken cbracken deleted the cocoapods-version-bump branch December 15, 2023 19:16
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 16, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 16, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 16, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2023
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Dec 18, 2023
flutter/flutter@2407f69...cdc83e5

2023-12-18 [email protected] Roll Flutter Engine from b3de65a6d3ea to 7f1a81d5545a (1 revision) (flutter/flutter#140309)
2023-12-18 [email protected] refactored cli tool ipa method name to support --export-options-plist (flutter/flutter#138555)
2023-12-18 [email protected] Restore and fix flavors_test_macos (flutter/flutter#139841)
2023-12-18 [email protected] Roll Flutter Engine from 626c93260f79 to b3de65a6d3ea (1 revision) (flutter/flutter#140308)
2023-12-17 [email protected] Roll Flutter Engine from f9c7aa27f13a to 626c93260f79 (1 revision) (flutter/flutter#140291)
2023-12-17 [email protected] Roll Flutter Engine from 726a137e3f99 to f9c7aa27f13a (1 revision) (flutter/flutter#140289)
2023-12-16 [email protected] Roll Flutter Engine from c5fc179cf0b3 to 726a137e3f99 (1 revision) (flutter/flutter#140280)
2023-12-16 [email protected] Roll Flutter Engine from a8d8fbbcef22 to c5fc179cf0b3 (1 revision) (flutter/flutter#140277)
2023-12-16 [email protected] Center Floating Snackbar with custom width when direction is RTL (flutter/flutter#140215)
2023-12-16 [email protected] Roll Flutter Engine from 6752398c2f54 to a8d8fbbcef22 (1 revision) (flutter/flutter#140274)
2023-12-16 [email protected] Use `SemanticsUpdateBuilder` again, remove all references to temporary `SemanticsUpdateBuilderNew` (flutter/flutter#139942)
2023-12-16 [email protected] Roll Flutter Engine from 7d300e5b9587 to 6752398c2f54 (1 revision) (flutter/flutter#140270)
2023-12-16 [email protected] Roll Flutter Engine from 832238a3b493 to 7d300e5b9587 (1 revision) (flutter/flutter#140268)
2023-12-16 [email protected] Roll Flutter Engine from 34d427aa009c to 832238a3b493 (1 revision) (flutter/flutter#140265)
2023-12-16 [email protected] Roll Flutter Engine from 74e4965a2845 to 34d427aa009c (1 revision) (flutter/flutter#140263)
2023-12-16 [email protected] Roll Flutter Engine from ca329dd84207 to 74e4965a2845 (4 revisions) (flutter/flutter#140262)
2023-12-16 [email protected] [github actions] minor PR to test latest github actions (flutter/flutter#140252)
2023-12-16 [email protected] Roll Flutter Engine from 6e3a04874be5 to ca329dd84207 (3 revisions) (flutter/flutter#140255)
2023-12-15 [email protected] Remove usage of testWidgetsWithLeakTracking. (flutter/flutter#140239)
2023-12-15 [email protected] Roll Flutter Engine from a8d861b53db1 to 6e3a04874be5 (1 revision) (flutter/flutter#140244)
2023-12-15 [email protected] Roll Flutter Engine from c48b08ac4682 to a8d861b53db1 (1 revision) (flutter/flutter#140240)
2023-12-15 [email protected] Use new `enabledFeature` param for `Analytics` (flutter/flutter#139934)
2023-12-15 [email protected] Roll Flutter Engine from db98451b063c to c48b08ac4682 (2 revisions) (flutter/flutter#140236)
2023-12-15 [email protected] Reorganize dependencies on leak_tracker. (flutter/flutter#140233)
2023-12-15 [email protected] [macOS,iOS] CocoaPods recommended version: 1.13.0 (flutter/flutter#135447)
2023-12-15 [email protected] Roll Flutter Engine from b36374085c4b to db98451b063c (1 revision) (flutter/flutter#140230)
2023-12-15 [email protected] Roll Flutter Engine from e89b7ed8812b to b36374085c4b (1 revision) (flutter/flutter#140228)
2023-12-15 [email protected] Roll Flutter Engine from 986a6fe198dc to e89b7ed8812b (1 revision) (flutter/flutter#140224)

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],[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
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 16, 2024
arc-yong pushed a commit to Arctuition/packages-arc that referenced this pull request Jun 14, 2024
flutter/flutter@2407f69...cdc83e5

2023-12-18 [email protected] Roll Flutter Engine from b3de65a6d3ea to 7f1a81d5545a (1 revision) (flutter/flutter#140309)
2023-12-18 [email protected] refactored cli tool ipa method name to support --export-options-plist (flutter/flutter#138555)
2023-12-18 [email protected] Restore and fix flavors_test_macos (flutter/flutter#139841)
2023-12-18 [email protected] Roll Flutter Engine from 626c93260f79 to b3de65a6d3ea (1 revision) (flutter/flutter#140308)
2023-12-17 [email protected] Roll Flutter Engine from f9c7aa27f13a to 626c93260f79 (1 revision) (flutter/flutter#140291)
2023-12-17 [email protected] Roll Flutter Engine from 726a137e3f99 to f9c7aa27f13a (1 revision) (flutter/flutter#140289)
2023-12-16 [email protected] Roll Flutter Engine from c5fc179cf0b3 to 726a137e3f99 (1 revision) (flutter/flutter#140280)
2023-12-16 [email protected] Roll Flutter Engine from a8d8fbbcef22 to c5fc179cf0b3 (1 revision) (flutter/flutter#140277)
2023-12-16 [email protected] Center Floating Snackbar with custom width when direction is RTL (flutter/flutter#140215)
2023-12-16 [email protected] Roll Flutter Engine from 6752398c2f54 to a8d8fbbcef22 (1 revision) (flutter/flutter#140274)
2023-12-16 [email protected] Use `SemanticsUpdateBuilder` again, remove all references to temporary `SemanticsUpdateBuilderNew` (flutter/flutter#139942)
2023-12-16 [email protected] Roll Flutter Engine from 7d300e5b9587 to 6752398c2f54 (1 revision) (flutter/flutter#140270)
2023-12-16 [email protected] Roll Flutter Engine from 832238a3b493 to 7d300e5b9587 (1 revision) (flutter/flutter#140268)
2023-12-16 [email protected] Roll Flutter Engine from 34d427aa009c to 832238a3b493 (1 revision) (flutter/flutter#140265)
2023-12-16 [email protected] Roll Flutter Engine from 74e4965a2845 to 34d427aa009c (1 revision) (flutter/flutter#140263)
2023-12-16 [email protected] Roll Flutter Engine from ca329dd84207 to 74e4965a2845 (4 revisions) (flutter/flutter#140262)
2023-12-16 [email protected] [github actions] minor PR to test latest github actions (flutter/flutter#140252)
2023-12-16 [email protected] Roll Flutter Engine from 6e3a04874be5 to ca329dd84207 (3 revisions) (flutter/flutter#140255)
2023-12-15 [email protected] Remove usage of testWidgetsWithLeakTracking. (flutter/flutter#140239)
2023-12-15 [email protected] Roll Flutter Engine from a8d861b53db1 to 6e3a04874be5 (1 revision) (flutter/flutter#140244)
2023-12-15 [email protected] Roll Flutter Engine from c48b08ac4682 to a8d861b53db1 (1 revision) (flutter/flutter#140240)
2023-12-15 [email protected] Use new `enabledFeature` param for `Analytics` (flutter/flutter#139934)
2023-12-15 [email protected] Roll Flutter Engine from db98451b063c to c48b08ac4682 (2 revisions) (flutter/flutter#140236)
2023-12-15 [email protected] Reorganize dependencies on leak_tracker. (flutter/flutter#140233)
2023-12-15 [email protected] [macOS,iOS] CocoaPods recommended version: 1.13.0 (flutter/flutter#135447)
2023-12-15 [email protected] Roll Flutter Engine from b36374085c4b to db98451b063c (1 revision) (flutter/flutter#140230)
2023-12-15 [email protected] Roll Flutter Engine from e89b7ed8812b to b36374085c4b (1 revision) (flutter/flutter#140228)
2023-12-15 [email protected] Roll Flutter Engine from 986a6fe198dc to e89b7ed8812b (1 revision) (flutter/flutter#140224)

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],[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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a: desktop Running on desktop tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants