Skip to content

Conversation

@reidbaker
Copy link
Contributor

@reidbaker reidbaker commented Nov 21, 2023

fixes /issues/135402
Edge case that was reported by a user along with a test case specifically covering their output.

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.

@github-actions github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Nov 21, 2023
@reidbaker reidbaker requested review from a team, andrewkolos and stuartmorgan-g November 21, 2023 16:22
@reidbaker reidbaker marked this pull request as ready for review November 21, 2023 16:23
Copy link
Contributor

@andrewkolos andrewkolos left a comment

Choose a reason for hiding this comment

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

LGTM with nit

// Should look something like 'openjdk 19.0.2 2023-01-17'.
final String longVersionText = versionLines.length >= 2 ? versionLines[1] : versionLines[0];

// The contents that matter come in the format '11.0.18' or '1.8.0_202'.
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this code comment be updated with more examples? This is just a nit, because anyone reading this code could look at the tests to learn what this is meant to match.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will update before merging

@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 27, 2023
@auto-submit auto-submit bot merged commit 311193d into master Nov 27, 2023
@auto-submit auto-submit bot deleted the i135402-quotes-around-single-version-number branch November 27, 2023 16:14
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 27, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 27, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 27, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 27, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 27, 2023
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Nov 28, 2023
Manual roll requested by [email protected]

flutter/flutter@b5f163a...6bf3ccd

2023-11-27 [email protected] [flutter_tools] fix instructions to disable CLI animations (flutter/flutter#139094)
2023-11-27 [email protected] Roll Flutter Engine from 9fe149249957 to 900ce09b08b2 (3 revisions) (flutter/flutter#139095)
2023-11-27 [email protected] Wide gamut and platform view integration test. (flutter/flutter#138837)
2023-11-27 [email protected] Add ability to customize `NavigationBar` indicator overlay and fix indicator shape for the overlay (flutter/flutter#138901)
2023-11-27 [email protected] Roll Flutter Engine from cc57ace8e2e7 to 9fe149249957 (1 revision) (flutter/flutter#139077)
2023-11-27 [email protected] Add type validation to non-template .arb file parsing logic (flutter/flutter#139035)
2023-11-27 [email protected] Update Android app project template to apply Kotlin Gradle plugin declaratively (flutter/flutter#139006)
2023-11-27 [email protected] Prepare for dynamically sized views - pt. 2 (flutter/flutter#139079)
2023-11-27 [email protected] Prepare for dynamically sized views (flutter/flutter#138565)
2023-11-27 [email protected] Write tests for API examples of BottomNavigationBar and IconButton (flutter/flutter#138188)
2023-11-27 [email protected] Roll Flutter Engine from 9b610ecda771 to cc57ace8e2e7 (2 revisions) (flutter/flutter#139072)
2023-11-27 [email protected] Give an actionable error message when a Pod requires a higher minimum OS version (flutter/flutter#138097)
2023-11-27 [email protected] Edge case on flutter/flutter/issues/135402 with test (flutter/flutter#138814)
2023-11-27 [email protected] Roll Packages from 97f0a40 to e774e88 (4 revisions) (flutter/flutter#139066)
2023-11-27 [email protected] Roll Flutter Engine from 6f499ecea657 to 9b610ecda771 (1 revision) (flutter/flutter#139063)
2023-11-27 [email protected] Roll Flutter Engine from 61233cde4bb3 to 6f499ecea657 (2 revisions) (flutter/flutter#139051)
2023-11-27 [email protected] Roll Flutter Engine from 292a92166a94 to 61233cde4bb3 (1 revision) (flutter/flutter#139041)
2023-11-27 [email protected] Roll Flutter Engine from ebebb25aaa46 to 292a92166a94 (3 revisions) (flutter/flutter#139037)
2023-11-27 [email protected] Roll Flutter Engine from eb18add9ebc5 to ebebb25aaa46 (2 revisions) (flutter/flutter#139034)
2023-11-26 [email protected] Roll Flutter Engine from 77432202f766 to eb18add9ebc5 (1 revision) (flutter/flutter#139007)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
// The contents that matter come in the format '11.0.18' or '1.8.0_202'.
final RegExp jdkVersionRegex = RegExp(r'\d+\.\d+(\.\d+(?:_\d+)?)?');
// The contents that matter come in the format '11.0.18', '1.8.0_202 or 21'.
final RegExp jdkVersionRegex = RegExp(r'(?<version>\d+(\.\d+(\.\d+(?:_\d+)?)?)?)');
Copy link
Contributor

Choose a reason for hiding this comment

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

If this no longer requires \., then isn't the code a few lines further down essentially dead code now?

If we're going to relax the main check instead of making the check below allow (java|openjdk), then it doesn't seem like we need the special codepath there at all any more.

caseycrogers pushed a commit to caseycrogers/flutter that referenced this pull request Dec 29, 2023
fixes flutter/issues/135402
Edge case that was reported by a user along with a test case specifically covering their output.
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[flutter doctor] Could not determine java version with JDK 21

3 participants