Case insensitive check flavor names against Xcode schemes by jmagman · Pull Request #61140 · flutter/flutter

jmagman · 2020-07-09T02:30:03Z

Description

Check --flavor parameter against Xcode schemes case insensitively. Exit earlier if the scheme names don't match.
Remove dead "make editable" code while we're here.

Related Issues

Fixes #59029.

Tests

Updated flavor integration test to have different cased flavor/scheme names.
project_tests
xcodeproj_tests

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.

jmagman · 2020-07-09T02:31:31Z

dev/integration_tests/flavors/ios/Runner.xcodeproj/xcshareddata/xcschemes/free.xcscheme

Xcode 12 didn't like this and removed it.

jmagman · 2020-07-09T22:42:23Z

packages/flutter_tools/lib/src/project.dart

    }
  }

-  Future<void> makeHostAppEditable() async {


jmagman · 2020-07-09T22:43:17Z

packages/flutter_tools/lib/src/project.dart

    ) || globals.cache.isOlderThanToolsStamp(ephemeralDirectory);
  }

-  Future<void> makeHostAppEditable() async {


jmagman · 2020-07-09T22:43:34Z

packages/flutter_tools/test/general.shard/project_test.dart

      });
    });

-    group('editable Android host app', () {


Remove dead code tests

jmagman · 2020-07-09T23:28:37Z

packages/flutter_tools/lib/src/project.dart

+      if (ios.existsSync())
+        await ios.productBundleIdentifier(null),
+      if (android.existsSync()) ...<String>[
+        android.applicationId,
+        android.group,
+      ],
+      if (example.android.existsSync())
+        example.android.applicationId,
+      if (example.ios.existsSync())
+        await example.ios.productBundleIdentifier(null),


This wasted time shelling out to tooling in nonexistent directories when creating a new project.

jonahwilliams · 2020-07-09T23:32:19Z

packages/flutter_tools/test/general.shard/project_test.dart

        expect(await project.ios.productBundleIdentifier(null), 'io.flutter.someProject.suffix');
      });
+
+      testWithMocks('fails with no flavor and defined schemes', () async {


TIL about testWithMocks

Will add this to my deprecate/remove list :)

jonahwilliams · 2020-07-09T23:35:25Z

packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart

+    );
+
+    expect(
+      () => defaultInfo.reportFlavorNotFoundAndExit(),


technically, you could pass in defaultInfo.reportFlavorNotFoundAndExit as a tear-off, since the throws matchers just require a zero-arity function. Just an FYI

Audited, got a PR coming your way.

jonahwilliams

LGTM

)

* Fix SliverList scrollOffsetCorrection 0 case (#62615) * Case insensitive check flavor names against Xcode schemes (#61140) * Address misc time picker design issues (#62803) * Update to the latest localizations (#63026) * Removed the inputFormatters from the text input fields used by the Date Pickers (#63461) * Fix App.framework path in Podfile (#63412) * Update engine hash to 1.20.2 Co-authored-by: Kate Lovett <[email protected]> Co-authored-by: Jenn Magder <[email protected]> Co-authored-by: Rami <[email protected]> Co-authored-by: Shi-Hao Hong <[email protected]> Co-authored-by: Darren Austin <[email protected]>

)

jmagman added platform-ios iOS applications specifically t: xcode "xcodebuild" on iOS and general Xcode project management labels Jul 9, 2020

jmagman self-assigned this Jul 9, 2020

fluttergithubbot added c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. work in progress; do not review labels Jul 9, 2020

googlebot added the cla: yes label Jul 9, 2020

jmagman commented Jul 9, 2020

View reviewed changes

jmagman force-pushed the flavor-name branch from 0db5061 to 62a814d Compare July 9, 2020 22:03

Case insensitive check flavor names against Xcode schemes

9936475

jmagman force-pushed the flavor-name branch from 62a814d to 9936475 Compare July 9, 2020 22:41

jmagman commented Jul 9, 2020

View reviewed changes

jmagman removed the work in progress; do not review label Jul 9, 2020

jmagman marked this pull request as ready for review July 9, 2020 23:25

jmagman requested review from christopherfujino and jonahwilliams July 9, 2020 23:25

jmagman commented Jul 9, 2020

View reviewed changes

jonahwilliams reviewed Jul 9, 2020

View reviewed changes

jonahwilliams approved these changes Jul 9, 2020

View reviewed changes

jmagman merged commit e110ca7 into flutter:master Jul 9, 2020

jmagman deleted the flavor-name branch July 9, 2020 23:56

This was referenced Jul 9, 2020

Prefer tear offs to lambdas in test expects #61196

Merged

buggy/messy deploy on iOS with multiple schemas/target #14648

Closed

pcsosinski pushed a commit to pcsosinski/flutter that referenced this pull request Aug 12, 2020

Case insensitive check flavor names against Xcode schemes (flutter#61140

b17a215

)

mingwandroid pushed a commit to mingwandroid/flutter that referenced this pull request Sep 6, 2020

Case insensitive check flavor names against Xcode schemes (flutter#61140

685a0d2

)

jmagman mentioned this pull request Nov 14, 2020

Remove unused host_app_editable_cocoapods template files #70518

Merged

jmagman mentioned this pull request Jun 9, 2021

flutter build ios --flavor [flavor_name] doesn't use specified flavor #78320

Closed

github-actions bot locked as resolved and limited conversation to collaborators Jul 30, 2021

Conversation

jmagman commented Jul 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issues

Tests

Checklist

Breaking Change

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jonahwilliams left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jmagman commented Jul 9, 2020 •

edited

Loading