Skip to content

Clean App.framework, Generated.xcconfig, flutter_export_environment.sh#51532

Merged
jmagman merged 2 commits intoflutter:masterfrom
jmagman:clean-app-framework
Feb 27, 2020
Merged

Clean App.framework, Generated.xcconfig, flutter_export_environment.sh#51532
jmagman merged 2 commits intoflutter:masterfrom
jmagman:clean-app-framework

Conversation

@jmagman
Copy link
Copy Markdown
Member

@jmagman jmagman commented Feb 27, 2020

Description

Mitigate #50568 by removing the old App.framework during flutter clean so users can get unstuck.
Also remove Generated.xcconfig and flutter_export_environment.sh while we're at it.

Related Issues

Mitigates #50568. Much safer potential hotfix than bigger fix at #51453.
Part of #12631.

Tests

Updated xcodeproj_test, clean_test.

Followed the very smart advice in #12631 (comment)

TL;DR make sure flutter build ios && flutter clean && flutter build ios works both with and without iOS platform plugins.

Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I signed the [CLA].
  • I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
  • I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • I updated/added relevant documentation (doc comments with ///).
  • All existing and new tests are passing.
  • The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

  • No, no existing tests failed, so this is not a breaking change.
  • Yes, this is a breaking change. If not, delete the remainder of this section.

@fluttergithubbot fluttergithubbot added the tool Affects the "flutter" command-line tool. See also t: labels. label Feb 27, 2020
result.stdout.contains('there are two concurrent builds running');
}

String readGeneratedXcconfig(String appPath) {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Dead code.

void cleanWorkspace(String workspacePath, String scheme) {
_processUtils.runSync(<String>[
Future<void> cleanWorkspace(String workspacePath, String scheme) async {
await _processUtils.run(<String>[
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This takes awhile, spinner was stuck.


deleteFile(flutterProject.dartTool);

final Directory androidEphemeralDirectory = flutterProject.android.ephemeralDirectory;
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Remove the locals for readability (when does that ever happen!?)

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

On phone, by mistake.

Copy link
Copy Markdown
Contributor

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

LGTM, magnifique!

@xster
Copy link
Copy Markdown
Member

xster commented Feb 27, 2020

LGTM

@jmagman jmagman merged commit 4fb9ce8 into flutter:master Feb 27, 2020
@jmagman jmagman deleted the clean-app-framework branch February 27, 2020 20:18
@jmagman jmagman added the platform-ios iOS applications specifically label Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants