Move macOS Podfile logic into the tool #72020
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8235f6e to
7557763
Compare
7557763 to
3eb5bd3
Compare
|
Rebased on #72372, removed |
stuartmorgan-g
approved these changes
Dec 17, 2020
| def flutter_root | ||
| generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) | ||
| unless File.exist?(generated_xcode_build_settings_path) | ||
| raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" |
There was a problem hiding this comment.
Nit: "make sure 'flutter pub get' is executed first" (to make parsing out the command part easier)
| return true if line =~ /^\s*macos:/ | ||
| } | ||
| return false | ||
| raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run flutter pub get" |
3eb5bd3 to
56dfbd1
Compare
This was referenced Dec 21, 2020
This was referenced May 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
macOS variants of #59209 and #59044 and the CocoaPods linking part of #70224
.flutter-plugins-dependenciesinstead of the old.flutter-pluginsto only embed themacos-enabled plugins via CocoaPods.s.dependency 'FlutterMacOS'and CocoaPods will try to download it from the CoocaPods trunk if the Podfile doesn'tpod 'FlutterMacOS', :path => relative/file. This has the advantage of making the Podfile.lock stable so:path: Flutter/ephemeral/.symlinks/flutter/darwin-x64-releasebecomes:path: Flutter/ephemeral/and doesn't change if you run in different build modes, so can be checked into the user's repo if desired.podhelper.rb. Plugins will now link on the frameworks in the artifact cache. This means the engine artifacts don't need to be symlinked and referred to by CocoaPods, which could have been hairy if any codesigning or (future) ARM thinning actually edited these files.FLUTTER_FRAMEWORK_DIRbuild setting.Related Issues
Fixes #46618
#59044
#71953
#70735
One fewer instance of #48918
Tests
Updated plugin_lint_mac