when getting xcworkspace, exclude hidden files by vashworth · Pull Request #114099 · flutter/flutter

vashworth · 2022-10-26T19:43:33Z

When getting the xcworkspace, exclude files that begin with ..

Fixes #29052.

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.

packages/flutter_tools/lib/src/ios/mac.dart

packages/flutter_tools/lib/src/xcode_project.dart

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

jmagman

LGTM!

christopherfujino · 2022-10-26T21:34:41Z

packages/flutter_tools/lib/src/xcode_project.dart

+    final List<FileSystemEntity> contents = hostAppRoot.listSync();
+    for (final FileSystemEntity entity in contents) {
+      // On certain volume types, there is sometimes a stray `._Runner.xcworkspace` file.
+      // Find the first non-hidden xcworkspace and return the path.


ignoring hidden files, are there sometimes multiple xcworkspace files here? If so, does it matter which we pick?

I don't believe there should be other xcworkspace files. @jmagman What do you think?

No, there shouldn't be. And it was picking the first one found before this PR, and this still does the same.

packages/flutter_tools/lib/src/xcode_project.dart

packages/flutter_tools/lib/src/ios/mac.dart

packages/flutter_tools/lib/src/xcode_project.dart

packages/flutter_tools/lib/src/ios/migrations/xcode_build_system_migration.dart

packages/flutter_tools/lib/src/macos/build_macos.dart

jmagman · 2022-11-02T19:44:04Z


01:09 +2429 ~4 -1: test/general.shard/ios/ios_device_start_nonprebuilt_test.dart: IOSDevice.startApp succeeds in release mode missing project info [E]                                                 
  FileSystemException: No such file or directory, path = 'ios/Runner.xcworkspace/xcshareddata' (OS Error: No such file or directory, errno = 2)

packages/flutter_tools/lib/src/ios/migrations/xcode_build_system_migration.dart

jmagman · 2022-11-02T22:56:03Z

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

    return line;
  }
-}
+}


info • Put a single newline at end of file • packages/flutter_tools/test/general.shard/ios/ios_project_migration_test.dart:1041:2 • eol_at_end_of_file

Fixed in 2637c23.

christopherfujino · 2022-11-03T18:55:13Z

Your Mac tool_tests_commands failure was fixed upstream, rebasing master from upstream should fix.

jmagman

LGTM

christopherfujino

LGTM, thanks so much for landing this fix!

…er#114099)

* 5280135 ecd3c4857 Roll Fuchsia Mac SDK from sNXsQVxntMX8f42LE... to 9Jb1-3tRPQ2ZhpTQC... (flutter/engine#37363) (flutter/flutter#114772) * a6da104 Adds support for the Material Badge widget, BadgeTheme, BadgeThemeData (flutter/flutter#114560) * 19c5fc5 0cbdf464c Add Matrix::LookAt (flutter/engine#37361) (flutter/flutter#114786) * c551fe3 4e45cfb4a Roll Fuchsia Mac SDK from 9Jb1-3tRPQ2ZhpTQC... to 5XOj9l5e2wkSpMKT1... (flutter/engine#37369) (flutter/flutter#114789) * a54a46d 6b57fddd1 Bump github/codeql-action from 2.1.29 to 2.1.31 (flutter/engine#37374) (flutter/flutter#114798) * 3c9288c Increase minimum supported macOS version from 10.13 to 10.14 (flutter/flutter#114713) * a1289a4 891d4a357 Roll Skia from c3c31be8729b to 513f0fd34590 (2 revisions) (flutter/engine#37377) (flutter/flutter#114802) * 04d6fd2 Roll Plugins from a279b9d to 3ca3410 (4 revisions) (flutter/flutter#114813) * 151c831 92d9ad27f Roll Skia from 513f0fd34590 to da9fad017aee (2 revisions) (flutter/engine#37379) (flutter/flutter#114816) * d6a8e92 Revert "Adds support for the Material Badge widget, BadgeTheme, BadgeThemeData (#114560)" (flutter/flutter#114819) * 7de60bb 334549704 Roll buildroot to d13d640 (flutter/engine#37380) (flutter/flutter#114821) * 496cf62 Delegate TestWindow.updateSemantics to the wrapped SingletonFlutterWindow (flutter/flutter#114733) * 497a528 Fix TextField/CupertinoTextField hint style overflow not work. (flutter/flutter#114335) * 7e36cf1 Mac Page Up / Page Down in text fields (flutter/flutter#105497) * 77c06c2 0075e10bc Move gclient var property to ci.yaml (flutter/engine#37351) (flutter/flutter#114828) * 378387b when getting xcworkspace, exclude hidden files (flutter/flutter#114099) * e901832 4e03d059d [Android] Speed up the method 'FlutterRenderer.getBitmap' (flutter/engine#37342) (flutter/flutter#114833) * 3cde69e Revert "Revert "Scribble mixin (#104128)" (#114647)" (flutter/flutter#114698) * e1adc96 feat: provide a way to set the initial child's alignment (flutter/flutter#114745) * fe5eb2d ee48c0392 Roll Fuchsia Mac SDK from 5XOj9l5e2wkSpMKT1... to sa5bVGimNo3JwLV27... (flutter/engine#37386) (flutter/flutter#114836) * 5628ebf [RawKeyboard] Allow inconsistent modifiers for Web (flutter/flutter#114499) * f1cdfa2 Use AppBar.systemOverlayStyle to style system navigation bar (flutter/flutter#104827) * e4e902d [flutter_tools] add compilation failure tests for new cases added in impellerc (flutter/flutter#114757) * 7640f31 a81a715ce Revert "Remove deprecated calls to updateSemantics in `PlatformDispatcher` (#36673)" (flutter/engine#37388) (flutter/flutter#114842) * 585d445 Roll Flutter Engine from a81a715ce6b2 to df602070ac4b (3 revisions) (flutter/flutter#114847) * 1ca2e0b Fix `CastError` in `StadiumBorder.lerpTo` and `StadiumBorder.lerpFrom` when using `BorderRadiusDirectional` (flutter/flutter#114826) * 2e85e74 004a30516 [fuchsia] embedding-flutter test (flutter/engine#37052) (flutter/flutter#114854) * 139b8f4 Roll Flutter Engine from 004a305166d5 to e7d7edab98ad (2 revisions) (flutter/flutter#114855) * 53e6876 Allow Flutter golden file tests to be flaky (flutter/flutter#114450) * a1432a9 Refactor fix_data.yaml (flutter/flutter#114192)

* 04d6fd2 Roll Plugins from a279b9d to 3ca3410 (4 revisions) (flutter/flutter#114813) * 151c831 92d9ad27f Roll Skia from 513f0fd34590 to da9fad017aee (2 revisions) (flutter/engine#37379) (flutter/flutter#114816) * d6a8e92 Revert "Adds support for the Material Badge widget, BadgeTheme, BadgeThemeData (#114560)" (flutter/flutter#114819) * 7de60bb 334549704 Roll buildroot to d13d64086f5e301bd0415eede895b34af220ef42 (flutter/engine#37380) (flutter/flutter#114821) * 496cf62 Delegate TestWindow.updateSemantics to the wrapped SingletonFlutterWindow (flutter/flutter#114733) * 497a528 Fix TextField/CupertinoTextField hint style overflow not work. (flutter/flutter#114335) * 7e36cf1 Mac Page Up / Page Down in text fields (flutter/flutter#105497) * 77c06c2 0075e10bc Move gclient var property to ci.yaml (flutter/engine#37351) (flutter/flutter#114828) * 378387b when getting xcworkspace, exclude hidden files (flutter/flutter#114099) * e901832 4e03d059d [Android] Speed up the method 'FlutterRenderer.getBitmap' (flutter/engine#37342) (flutter/flutter#114833) * 3cde69e Revert "Revert "Scribble mixin (#104128)" (#114647)" (flutter/flutter#114698) * e1adc96 feat: provide a way to set the initial child's alignment (flutter/flutter#114745) * fe5eb2d ee48c0392 Roll Fuchsia Mac SDK from 5XOj9l5e2wkSpMKT1... to sa5bVGimNo3JwLV27... (flutter/engine#37386) (flutter/flutter#114836) * 5628ebf [RawKeyboard] Allow inconsistent modifiers for Web (flutter/flutter#114499) * f1cdfa2 Use AppBar.systemOverlayStyle to style system navigation bar (flutter/flutter#104827) * e4e902d [flutter_tools] add compilation failure tests for new cases added in impellerc (flutter/flutter#114757) * 7640f31 a81a715ce Revert "Remove deprecated calls to updateSemantics in `PlatformDispatcher` (#36673)" (flutter/engine#37388) (flutter/flutter#114842) * 585d445 Roll Flutter Engine from a81a715ce6b2 to df602070ac4b (3 revisions) (flutter/flutter#114847) * 1ca2e0b Fix `CastError` in `StadiumBorder.lerpTo` and `StadiumBorder.lerpFrom` when using `BorderRadiusDirectional` (flutter/flutter#114826) * 2e85e74 004a30516 [fuchsia] embedding-flutter test (flutter/engine#37052) (flutter/flutter#114854) * 139b8f4 Roll Flutter Engine from 004a305166d5 to e7d7edab98ad (2 revisions) (flutter/flutter#114855) * 53e6876 Allow Flutter golden file tests to be flaky (flutter/flutter#114450) * a1432a9 Refactor fix_data.yaml (flutter/flutter#114192)

* exclude xcworkspace that begins with a period * fix if spacing, add comment * add unit test for when no xcworkspace found * update to use xcodeWorkspace, make it nullable and refactor * check if hostAppRoot exists before trying to get xcworkspace * use local variables to take advantage of type promotion * only check if not null, don't need to check if exists * readd exist check for migrate * readd missing line at end of file

* 04d6fd2 Roll Plugins from a279b9d to 3ca3410 (4 revisions) (flutter/flutter#114813) * 151c831 92d9ad27f Roll Skia from 513f0fd34590 to da9fad017aee (2 revisions) (flutter/engine#37379) (flutter/flutter#114816) * d6a8e92 Revert "Adds support for the Material Badge widget, BadgeTheme, BadgeThemeData (#114560)" (flutter/flutter#114819) * 7de60bb 334549704 Roll buildroot to d13d64086f5e301bd0415eede895b34af220ef42 (flutter/engine#37380) (flutter/flutter#114821) * 496cf62 Delegate TestWindow.updateSemantics to the wrapped SingletonFlutterWindow (flutter/flutter#114733) * 497a528 Fix TextField/CupertinoTextField hint style overflow not work. (flutter/flutter#114335) * 7e36cf1 Mac Page Up / Page Down in text fields (flutter/flutter#105497) * 77c06c2 0075e10bc Move gclient var property to ci.yaml (flutter/engine#37351) (flutter/flutter#114828) * 378387b when getting xcworkspace, exclude hidden files (flutter/flutter#114099) * e901832 4e03d059d [Android] Speed up the method 'FlutterRenderer.getBitmap' (flutter/engine#37342) (flutter/flutter#114833) * 3cde69e Revert "Revert "Scribble mixin (#104128)" (#114647)" (flutter/flutter#114698) * e1adc96 feat: provide a way to set the initial child's alignment (flutter/flutter#114745) * fe5eb2d ee48c0392 Roll Fuchsia Mac SDK from 5XOj9l5e2wkSpMKT1... to sa5bVGimNo3JwLV27... (flutter/engine#37386) (flutter/flutter#114836) * 5628ebf [RawKeyboard] Allow inconsistent modifiers for Web (flutter/flutter#114499) * f1cdfa2 Use AppBar.systemOverlayStyle to style system navigation bar (flutter/flutter#104827) * e4e902d [flutter_tools] add compilation failure tests for new cases added in impellerc (flutter/flutter#114757) * 7640f31 a81a715ce Revert "Remove deprecated calls to updateSemantics in `PlatformDispatcher` (#36673)" (flutter/engine#37388) (flutter/flutter#114842) * 585d445 Roll Flutter Engine from a81a715ce6b2 to df602070ac4b (3 revisions) (flutter/flutter#114847) * 1ca2e0b Fix `CastError` in `StadiumBorder.lerpTo` and `StadiumBorder.lerpFrom` when using `BorderRadiusDirectional` (flutter/flutter#114826) * 2e85e74 004a30516 [fuchsia] embedding-flutter test (flutter/engine#37052) (flutter/flutter#114854) * 139b8f4 Roll Flutter Engine from 004a305166d5 to e7d7edab98ad (2 revisions) (flutter/flutter#114855) * 53e6876 Allow Flutter golden file tests to be flaky (flutter/flutter#114450) * a1432a9 Refactor fix_data.yaml (flutter/flutter#114192)

exclude xcworkspace that begins with a period

f6b8507

flutter-dashboard bot added platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. labels Oct 26, 2022

vashworth requested a review from jmagman October 26, 2022 19:44

vashworth marked this pull request as ready for review October 26, 2022 19:57

jmagman reviewed Oct 26, 2022

View reviewed changes

packages/flutter_tools/lib/src/ios/mac.dart Outdated Show resolved Hide resolved

packages/flutter_tools/lib/src/xcode_project.dart Outdated Show resolved Hide resolved

fix if spacing, add comment

c8af19f

jmagman reviewed Oct 26, 2022

View reviewed changes

packages/flutter_tools/test/general.shard/project_test.dart Outdated Show resolved Hide resolved

add unit test for when no xcworkspace found

8a35243

jmagman requested a review from christopherfujino October 26, 2022 21:27

jmagman approved these changes Oct 26, 2022

View reviewed changes

christopherfujino reviewed Oct 26, 2022

View reviewed changes

jmagman requested changes Oct 26, 2022

View reviewed changes

packages/flutter_tools/lib/src/xcode_project.dart Outdated Show resolved Hide resolved

packages/flutter_tools/lib/src/ios/mac.dart Outdated Show resolved Hide resolved

update to use xcodeWorkspace, make it nullable and refactor

1596b41

vashworth requested review from christopherfujino and jmagman October 28, 2022 15:04

Merge remote-tracking branch 'upstream/master' into hidden_xcworkspace

383ec35

jmagman reviewed Oct 28, 2022

View reviewed changes

packages/flutter_tools/lib/src/xcode_project.dart Show resolved Hide resolved

vashworth added 2 commits October 31, 2022 09:35

check if hostAppRoot exists before trying to get xcworkspace

0305e86

Merge remote-tracking branch 'upstream/master' into hidden_xcworkspace

3cb493e

vashworth requested a review from jmagman November 1, 2022 18:12

jmagman reviewed Nov 1, 2022

View reviewed changes

packages/flutter_tools/lib/src/ios/migrations/xcode_build_system_migration.dart Outdated Show resolved Hide resolved

use local variables to take advantage of type promotion

a89d933

jmagman reviewed Nov 2, 2022

View reviewed changes

packages/flutter_tools/lib/src/macos/build_macos.dart Outdated Show resolved Hide resolved

only check if not null, don't need to check if exists

16e9dea

jmagman reviewed Nov 2, 2022

View reviewed changes

packages/flutter_tools/lib/src/ios/migrations/xcode_build_system_migration.dart Outdated Show resolved Hide resolved

readd exist check for migrate

224a5c4

jmagman reviewed Nov 2, 2022

View reviewed changes

readd missing line at end of file

2637c23

jmagman mentioned this pull request Nov 3, 2022

ci.yaml validation stuck pending in PR check #114633

Closed

Merge remote-tracking branch 'upstream/master' into hidden_xcworkspace

3bc8555

jmagman approved these changes Nov 3, 2022

View reviewed changes

christopherfujino approved these changes Nov 3, 2022

View reviewed changes

vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 7, 2022

auto-submit bot merged commit 378387b into flutter:master Nov 7, 2022

engine-flutter-autoroll mentioned this pull request Nov 8, 2022

Roll Flutter from 5ea5a5330169 to a1432a9c5da2 (30 revisions) flutter/packages#2788

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 8, 2022

378387b when getting xcworkspace, exclude hidden files (flutter/flutt…

5f9ffdb

…er#114099)

engine-flutter-autoroll mentioned this pull request Nov 8, 2022

Roll Flutter from a1289a41358d to a1432a9c5da2 (23 revisions) flutter/plugins#6681

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Nov 8, 2022

378387b when getting xcworkspace, exclude hidden files (flutter/flutt…

bcc3301

…er#114099)

vashworth deleted the hidden_xcworkspace branch September 27, 2023 15:35

Conversation

vashworth commented Oct 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jmagman left a comment

Choose a reason for hiding this comment

Uh oh!

christopherfujino Oct 26, 2022

Choose a reason for hiding this comment

Uh oh!

vashworth Oct 26, 2022

Choose a reason for hiding this comment

Uh oh!

jmagman Oct 26, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jmagman commented Nov 2, 2022

Uh oh!

Uh oh!

jmagman Nov 2, 2022

Choose a reason for hiding this comment

Uh oh!

vashworth Nov 3, 2022

Choose a reason for hiding this comment

Uh oh!

christopherfujino commented Nov 3, 2022

Uh oh!

jmagman left a comment

Choose a reason for hiding this comment

Uh oh!

christopherfujino left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vashworth commented Oct 26, 2022 •

edited

Loading