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.

Sign up for GitHub

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

Jump to bottom

adds build number of ios device in flutter devices command #84512

Merged
merged 15 commits into from Jun 23, 2021
Merged

adds build number of ios device in flutter devices command #84512

merged 15 commits into from Jun 23, 2021

Conversation

balvinderz
Copy link
Contributor

@balvinderz balvinderz commented Jun 13, 2021 •
edited

adds build number of ios device in flutter devices command

Related Issues

#64351

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

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 feature I am adding, or Hixie said the 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.

@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jun 13, 2021
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@google-cla google-cla bot added the cla: yes label Jun 13, 2021
@balvinderz
Copy link
Contributor Author

@jmagman @jonahwilliams can you please review this.

jmagman
jmagman requested changes Jun 14, 2021
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

This still happens to work parsing the SDK version out of 14.5 (18L5173d) instead of just 14.5

flutter/packages/flutter_tools/lib/src/ios/devices.dart

Lines 185 to 186 in 59f6cc7

int get majorSdkVersion {
final String majorVersionString = _sdkVersion?.split('.')?.first?.trim();

However, it may be better to be more explicit and parse the build number separately from operatingSystemVersion, and pass it into IOSDevice to be used in sdkNameAndVersion but not in majorSdkVersion logic that parses the SDK version. Xcode has been known to change formats of these fields between versions (though not this particular field, yet).

@balvinderz balvinderz requested a review from jmagman June 21, 2021 13:58
jmagman
jmagman requested changes Jun 22, 2021
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

A minor comment nit and a request for another test. Looking good though!

packages/flutter_tools/lib/src/macos/xcdevice.dart Outdated Show resolved Hide resolved
packages/flutter_tools/lib/src/macos/xcdevice.dart Show resolved Hide resolved
balvinderz
balvinderz commented Jun 22, 2021
View reviewed changes
packages/flutter_tools/lib/src/macos/xcdevice.dart
@@ -363,7 +373,20 @@ class XCDevice {
// "13.3 (17C54)"
final RegExp operatingSystemRegex = RegExp(r'(.*) \(.*\)$');
final String operatingSystemVersion = deviceProperties['operatingSystemVersion'] as String;
return operatingSystemRegex.firstMatch(operatingSystemVersion.trim())?.group(1);
if(operatingSystemRegex.hasMatch(operatingSystemVersion.trim())) {
return operatingSystemRegex.firstMatch(operatingSystemVersion.trim())?.group(1);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

i added a condition to check here if the regex had a match , because it was returning null for 10.1 . i think it should return 10.1.

@balvinderz
Copy link
Contributor Author

@jmagman tests are failing without even starting :/

@balvinderz balvinderz requested a review from jmagman June 23, 2021 14:56
jmagman
jmagman approved these changes Jun 23, 2021
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@fluttergithubbot fluttergithubbot merged commit 604c59e into flutter:master Jun 23, 2021
@balvinderz balvinderz deleted the ios_build_version branch June 24, 2021 12:31
@jmagman jmagman mentioned this pull request Aug 31, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmagman jmagman jmagman approved these changes

Assignees
No one assigned
Labels
tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@balvinderz @jmagman @fluttergithubbot